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

[bms_fbsd at users.sourceforge.net]

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

Log Message:
-----------
naming catchup

Modified Paths:
--------------
    trunk/xorp/bgp/SConscript
    trunk/xorp/bgp/tests/SConscript

Modified: trunk/xorp/bgp/SConscript
===================================================================
--- trunk/xorp/bgp/SConscript	2009-11-27 07:45:38 UTC (rev 11618)
+++ trunk/xorp/bgp/SConscript	2009-11-27 07:47:20 UTC (rev 11619)
@@ -67,16 +67,16 @@
     'xorp_comm',
 ])
 
-### libbgp
+### libxorp_bgp
 
-libbgp_env = env.Clone()
+libxorp_bgp_env = env.Clone()
 
 #if is_shared:
-#    libbgp_env.AppendUnique(LINKFLAGS = [
+#    libxorp_bgp_env.AppendUnique(LINKFLAGS = [
 #        '-Wl,-z,defs',
 #    ])
 
-libbgpsrcs = [
+libxorp_bgp_srcs = [
 	'aspath.cc',
 	'attribute_manager.cc',
 	'bgp_trie.cc',
@@ -127,13 +127,14 @@
 	'xrl_target.cc',
 	]
 
-#libbgp = libbgp_env.SharedLibrary(target = 'libbgp', source = libbgpsrcs)
+#libxorp_bgp = libxorp_bgp_env.SharedLibrary(target = 'libxorp_bgp', source = libxorp_bgp_srcs)
 
 # XXX Static until ASPath and other objects are dealt with.
-libbgp = libbgp_env.StaticLibrary(target = 'libbgp', source = libbgpsrcs)
+libxorp_bgp = libxorp_bgp_env.StaticLibrary(target = 'libxorp_bgp',
+					    source = libxorp_bgp_srcs)
 
 #env.Alias('install',
-#          env.InstallLibrary('$libdir', libbgp))
+#          env.InstallLibrary('$libdir', libxorp_bgp))
 
 ### xorp_bgp
 
@@ -156,4 +157,4 @@
 env.Alias('install',
           env.InstallProgram(bgppath, bgp))
 
-Default(libbgp, bgp)
+Default(libxorp_bgp, bgp)

Modified: trunk/xorp/bgp/tests/SConscript
===================================================================
--- trunk/xorp/bgp/tests/SConscript	2009-11-27 07:45:38 UTC (rev 11618)
+++ trunk/xorp/bgp/tests/SConscript	2009-11-27 07:47:20 UTC (rev 11619)
@@ -43,7 +43,7 @@
 	])
 
 env.AppendUnique(LIBS = [
-	'ospf',
+	'xorp_ospf',
 	#'ospfv2base',
 	#'ospfv3base',
 	'ripxif',


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