[Xorp-cvs] SF.net SVN: xorp:[11618] trunk/xorp

[bms_fbsd at users.sourceforge.net]

Revision: 11618
          http://xorp.svn.sourceforge.net/xorp/?rev=11618&view=rev
Author:   bms_fbsd
Date:     2009-11-27 07:45:38 +0000 (Fri, 27 Nov 2009)

Log Message:
-----------
librib => libxorp_rib
librtrmgr => libxorp_rtrmgr

Modified Paths:
--------------
    trunk/xorp/rib/SConscript
    trunk/xorp/rib/tests/SConscript
    trunk/xorp/rtrmgr/SConscript

Modified: trunk/xorp/rib/SConscript
===================================================================
--- trunk/xorp/rib/SConscript	2009-11-27 07:42:31 UTC (rev 11617)
+++ trunk/xorp/rib/SConscript	2009-11-27 07:45:38 UTC (rev 11618)
@@ -50,7 +50,7 @@
     ])
 
 env.AppendUnique(LIBS = [
-    'rib',
+    'xorp_rib',				# The library, not the executable.
     'xorp_fea_client',
     'feaifmgrmirrorxif',
     'feaifmgrreplicatorxif',
@@ -75,7 +75,7 @@
     'xorp_comm'
 ])
 
-libribsrcs = [
+libxorp_rib_srcs = [
 	     'profile_vars.cc',
 	     'protocol.cc',
 	     'redist_xrl.cc',
@@ -99,9 +99,13 @@
              ]
 
 if is_shared:
-    librib = env.SharedLibrary(target = 'librib', source = libribsrcs, LIBS = '')
+    libxorp_rib = env.SharedLibrary(target = 'libxorp_rib',
+				    source = libxorp_rib_srcs,
+				    LIBS = '')
 else:
-    librib = env.StaticLibrary(target = 'librib', source = libribsrcs, LIBS = '')
+    libxorp_rib = env.StaticLibrary(target = 'libxorp_rib',
+				    source = libxorp_rib_srcs,
+				    LIBS = '')
 
 ribsrcs = [
           'main_rib.cc',
@@ -117,6 +121,6 @@
 
 if is_shared:
     env.Alias('install',
-              env.InstallLibrary('$libdir', librib))
+              env.InstallLibrary('$libdir', libxorp_rib))
 
 Default(rib)

Modified: trunk/xorp/rib/tests/SConscript
===================================================================
--- trunk/xorp/rib/tests/SConscript	2009-11-27 07:42:31 UTC (rev 11617)
+++ trunk/xorp/rib/tests/SConscript	2009-11-27 07:45:38 UTC (rev 11618)
@@ -44,8 +44,8 @@
 	])
 
 env.AppendUnique(LIBS = [
-	'rib',
-	#'ribxrl', #notyet
+	'xorp_rib',
+	#'xorp_rib_xrl', #notyet
 	'xorp_fea_client',
 	'feaifmgrmirrorxif',
 	'feaifmgrreplicatorxif',

Modified: trunk/xorp/rtrmgr/SConscript
===================================================================
--- trunk/xorp/rtrmgr/SConscript	2009-11-27 07:42:31 UTC (rev 11617)
+++ trunk/xorp/rtrmgr/SConscript	2009-11-27 07:45:38 UTC (rev 11618)
@@ -46,9 +46,9 @@
     '.',
     ])
 
-### librtrmgr
+### libxorp_rtrmgr
 
-librtrmgr_env = env.Clone()
+libxorp_rtrmgr_env = env.Clone()
 
 # FIXME generate lex/yacc from source
 # shorthand this plz
@@ -65,7 +65,7 @@
 #opcmd_env.AppendUnique(LEXFLAGS='-Popcmd')
 #opcmd_env.CXXFile(source='op_commands.ll', target='lex.opcmd.cc')
 
-librtrmgr_srcs = [
+libxorp_rtrmgr_srcs = [
 	'command_tree.cc',
 	'conf_tree.cc',
 	'conf_tree_node.cc',
@@ -102,8 +102,8 @@
 
 # Runtime XRL syntax validation for developers.
 if env['debug_xrldb']:
-    librtrmgr_srcs += [ 'xrldb.cc' ]
-    librtrmgr_env.AppendUnique(CPPDEFINES = [
+    libxorp_rtrmgr_srcs += [ 'xrldb.cc' ]
+    libxorp_rtrmgr_env.AppendUnique(CPPDEFINES = [
         ( 'DEBUG_XRLDB', 1 ),
     ])
 
@@ -117,10 +117,10 @@
 util_cc_env = env.Clone()
 util_cc_env.AppendUnique(CPPDEFINES=xorp_paths.items())
 obj_util = util_cc_env.StaticObject(source='util.cc')
-librtrmgr_srcs += [ obj_util ]
+libxorp_rtrmgr_srcs += [ obj_util ]
 
-librtrmgr = librtrmgr_env.StaticLibrary(target = 'librtrmgr',
-					source = librtrmgr_srcs)
+libxorp_rtrmgr = libxorp_rtrmgr_env.StaticLibrary(target = 'libxorp_rtrmgr',
+					source = libxorp_rtrmgr_srcs)
 
 ### rtrmgr
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.