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

bms_fbsd at users.sourceforge.net bms_fbsd at users.sourceforge.net
Thu Nov 26 22:53:36 PST 2009


Revision: 11609
          http://xorp.svn.sourceforge.net/xorp/?rev=11609&view=rev
Author:   bms_fbsd
Date:     2009-11-27 06:53:35 +0000 (Fri, 27 Nov 2009)

Log Message:
-----------
libxipc => libxorp_ipc

Modified Paths:
--------------
    trunk/xorp/bgp/SConscript
    trunk/xorp/bgp/harness/SConscript
    trunk/xorp/bgp/tests/SConscript
    trunk/xorp/bgp/tools/SConscript
    trunk/xorp/cli/SConscript
    trunk/xorp/cli/tests/SConscript
    trunk/xorp/cli/tools/SConscript
    trunk/xorp/contrib/mld6igmp_lite/SConscript
    trunk/xorp/contrib/olsr/SConscript
    trunk/xorp/fea/SConscript
    trunk/xorp/fea/tests/SConscript
    trunk/xorp/fea/tools/SConscript
    trunk/xorp/fib2mrib/SConscript
    trunk/xorp/libfeaclient/tests/SConscript
    trunk/xorp/libxipc/SConscript
    trunk/xorp/libxipc/tests/SConscript
    trunk/xorp/mld6igmp/SConscript
    trunk/xorp/ospf/SConscript
    trunk/xorp/ospf/tests/SConscript
    trunk/xorp/ospf/tools/SConscript
    trunk/xorp/pim/SConscript
    trunk/xorp/policy/SConscript
    trunk/xorp/rib/SConscript
    trunk/xorp/rib/tests/SConscript
    trunk/xorp/rib/tools/SConscript
    trunk/xorp/rip/SConscript
    trunk/xorp/rip/tests/SConscript
    trunk/xorp/rip/tools/SConscript
    trunk/xorp/rtrmgr/SConscript
    trunk/xorp/rtrmgr/tests/SConscript
    trunk/xorp/static_routes/SConscript
    trunk/xorp/vrrp/SConscript

Modified: trunk/xorp/bgp/SConscript
===================================================================
--- trunk/xorp/bgp/SConscript	2009-11-27 06:38:43 UTC (rev 11608)
+++ trunk/xorp/bgp/SConscript	2009-11-27 06:53:35 UTC (rev 11609)
@@ -62,7 +62,7 @@
     'profileclientxif',
     'feaifmgrmirrorxif',
     'feaifmgrreplicatorxif',
-    'xipc',
+    'xorp_ipc',
     'xorp',
     'xorp_comm',
 ])

Modified: trunk/xorp/bgp/harness/SConscript
===================================================================
--- trunk/xorp/bgp/harness/SConscript	2009-11-27 06:38:43 UTC (rev 11608)
+++ trunk/xorp/bgp/harness/SConscript	2009-11-27 06:53:35 UTC (rev 11609)
@@ -38,7 +38,7 @@
 
 env.AppendUnique(LIBS = [
     'bgpxif',
-    'xipc',
+    'xorp_ipc',
     'xorp',
     'xorp_comm',
     ])

Modified: trunk/xorp/bgp/tests/SConscript
===================================================================
--- trunk/xorp/bgp/tests/SConscript	2009-11-27 06:38:43 UTC (rev 11608)
+++ trunk/xorp/bgp/tests/SConscript	2009-11-27 06:53:35 UTC (rev 11609)
@@ -56,7 +56,7 @@
 	'fearawpkt6xif',
 	'policybackend',
 	'policycommon',
-	'xipc',
+	'xorp_ipc',
 	'xorp_proto',
 	'xorp',
 	'xorp_comm',

Modified: trunk/xorp/bgp/tools/SConscript
===================================================================
--- trunk/xorp/bgp/tools/SConscript	2009-11-27 06:38:43 UTC (rev 11608)
+++ trunk/xorp/bgp/tools/SConscript	2009-11-27 06:53:35 UTC (rev 11609)
@@ -40,7 +40,7 @@
 env.AppendUnique(LIBS = [
     'bgp',			# for ASPath
     'bgpxif',
-    'xipc',
+    'xorp_ipc',
     'xorp',
     'xorp_comm',
     ])

Modified: trunk/xorp/cli/SConscript
===================================================================
--- trunk/xorp/cli/SConscript	2009-11-27 06:38:43 UTC (rev 11608)
+++ trunk/xorp/cli/SConscript	2009-11-27 06:53:35 UTC (rev 11609)
@@ -51,7 +51,7 @@
     'clibase',
     'tecla_xorp',
     'xorp_proto',
-    'xipc',
+    'xorp_ipc',
     'xorp_comm',
     'xorp',
     ])

Modified: trunk/xorp/cli/tests/SConscript
===================================================================
--- trunk/xorp/cli/tests/SConscript	2009-11-27 06:38:43 UTC (rev 11608)
+++ trunk/xorp/cli/tests/SConscript	2009-11-27 06:53:35 UTC (rev 11609)
@@ -46,7 +46,7 @@
 	'clibase',
 	'finder',
 	'tecla_xorp',
-	'xipc',
+	'xorp_ipc',
 	'xorp_proto',
 	'xorp',
 	'xorp_comm',

Modified: trunk/xorp/cli/tools/SConscript
===================================================================
--- trunk/xorp/cli/tools/SConscript	2009-11-27 06:38:43 UTC (rev 11608)
+++ trunk/xorp/cli/tools/SConscript	2009-11-27 06:53:35 UTC (rev 11609)
@@ -39,7 +39,7 @@
 
 env.AppendUnique(LIBS = [
     'libcliprocessorxif',
-    'xipc',
+    'xorp_ipc',
     'xorp',
     'proto',
     'xorp_comm',

Modified: trunk/xorp/contrib/mld6igmp_lite/SConscript
===================================================================
--- trunk/xorp/contrib/mld6igmp_lite/SConscript	2009-11-27 06:38:43 UTC (rev 11608)
+++ trunk/xorp/contrib/mld6igmp_lite/SConscript	2009-11-27 06:53:35 UTC (rev 11609)
@@ -56,7 +56,7 @@
     'feaifmgrmirrorbase',
     'mld6igmpbase',
     'xorp_mrt',
-    'xipc',
+    'xorp_ipc',
     'xorp',
     'xorp_proto',
     'xorp_comm'

Modified: trunk/xorp/contrib/olsr/SConscript
===================================================================
--- trunk/xorp/contrib/olsr/SConscript	2009-11-27 06:38:43 UTC (rev 11608)
+++ trunk/xorp/contrib/olsr/SConscript	2009-11-27 06:53:35 UTC (rev 11609)
@@ -63,7 +63,7 @@
     'fearawpkt4xif',
     'fearawpkt6xif',
     'feaifmgrmirrorbase',
-    'xipc',
+    'xorp_ipc',
     'xorp',
     'xorp_proto',
     'xorp_comm',

Modified: trunk/xorp/fea/SConscript
===================================================================
--- trunk/xorp/fea/SConscript	2009-11-27 06:38:43 UTC (rev 11608)
+++ trunk/xorp/fea/SConscript	2009-11-27 06:53:35 UTC (rev 11609)
@@ -103,7 +103,7 @@
     'xorp_mrt',
     'tecla_xorp',
     'xorp_proto',
-    'xipc',
+    'xorp_ipc',
     'xorp_comm',
     'xorp'
     ]

Modified: trunk/xorp/fea/tests/SConscript
===================================================================
--- trunk/xorp/fea/tests/SConscript	2009-11-27 06:38:43 UTC (rev 11608)
+++ trunk/xorp/fea/tests/SConscript	2009-11-27 06:53:35 UTC (rev 11609)
@@ -89,7 +89,7 @@
 	'xorp_mrt',
 	'tecla_xorp',
 	'xorp_proto',
-	'xipc',
+	'xorp_ipc',
 	'xorp_comm',
 	'xorp'
 	]

Modified: trunk/xorp/fea/tools/SConscript
===================================================================
--- trunk/xorp/fea/tools/SConscript	2009-11-27 06:38:43 UTC (rev 11608)
+++ trunk/xorp/fea/tools/SConscript	2009-11-27 06:53:35 UTC (rev 11609)
@@ -43,7 +43,7 @@
     'feaifmgrmirrorxif',
     'feaifmgrreplicatorxif',
     'feaifmgrmirrorbase',
-    'xipc',
+    'xorp_ipc',
     'xorp',
     'xorp_proto',
     'xorp_comm',

Modified: trunk/xorp/fib2mrib/SConscript
===================================================================
--- trunk/xorp/fib2mrib/SConscript	2009-11-27 06:38:43 UTC (rev 11608)
+++ trunk/xorp/fib2mrib/SConscript	2009-11-27 06:53:35 UTC (rev 11609)
@@ -55,7 +55,7 @@
     'feafibxif',
     'ribxif',
     'feaifmgrmirrorbase',
-    'xipc',
+    'xorp_ipc',
     'xorp',
     'xorp_proto',
     'xorp_comm'

Modified: trunk/xorp/libfeaclient/tests/SConscript
===================================================================
--- trunk/xorp/libfeaclient/tests/SConscript	2009-11-27 06:38:43 UTC (rev 11608)
+++ trunk/xorp/libfeaclient/tests/SConscript	2009-11-27 06:53:35 UTC (rev 11609)
@@ -45,7 +45,7 @@
 	'feaifmgrmirrorxif',
 	'feaifmgrreplicatorxif',
 	'feaifmgrmirrorbase',
-	'xipc',
+	'xorp_ipc',
 	'xorp',
 	'xorp_comm',
 	])

Modified: trunk/xorp/libxipc/SConscript
===================================================================
--- trunk/xorp/libxipc/SConscript	2009-11-27 06:38:43 UTC (rev 11608)
+++ trunk/xorp/libxipc/SConscript	2009-11-27 06:53:35 UTC (rev 11609)
@@ -91,22 +91,25 @@
         '$BUILDDIR/xrl/interfaces/common_xif$SHOBJSUFFIX',
     ]
 else:
-    obj_fcb = libxipc_env.StaticObject(target = 'libxipc_finder_client_base',
-                                       source = '$BUILDDIR/xrl/targets/finder_client_base.cc')
-    obj_fxif = libxipc_env.StaticObject(target = 'libxipc_finder_xif',
-                                        source = '$BUILDDIR/xrl/interfaces/finder_xif.cc')
-    obj_cxif = libxipc_env.StaticObject(target = 'libxipc_common_xif',
-                                        source = '$BUILDDIR/xrl/interfaces/common_xif.cc')
+    obj_fcb = libxipc_env.StaticObject(
+	target = 'libxipc_finder_client_base',
+	source = '$BUILDDIR/xrl/targets/finder_client_base.cc')
+    obj_fxif = libxipc_env.StaticObject(
+	target = 'libxipc_finder_xif',
+	source = '$BUILDDIR/xrl/interfaces/finder_xif.cc')
+    obj_cxif = libxipc_env.StaticObject(
+	target = 'libxipc_common_xif',
+	source = '$BUILDDIR/xrl/interfaces/common_xif.cc')
     libxipc_sources += [ obj_fcb, obj_fxif, obj_cxif ]
 
 # actual library target
 if is_shared:
-    libxipc = libxipc_env.SharedLibrary(target = 'libxipc',
+    libxipc = libxipc_env.SharedLibrary(target = 'libxorp_ipc',
                                         source = libxipc_sources)
     env.Alias('install',
               env.InstallLibrary('$libdir', libxipc))
 else:
-    libxipc = libxipc_env.StaticLibrary(target = 'libxipc',
+    libxipc = libxipc_env.StaticLibrary(target = 'libxorp_ipc',
                                         source = libxipc_sources)
 
 #
@@ -126,9 +129,9 @@
     ])
 
 libfinder_env.AppendUnique(LIBS = [
-    'libxipc',
-    'libcomm',
-    'libxorp'
+    'xorp_ipc',
+    'xorp_comm',
+    'xorp'
     ])
 
 libfinder_sources = [
@@ -146,22 +149,25 @@
         '$BUILDDIR/xrl/interfaces/finder_event_observer_xif$SHOBJSUFFIX',
     ]
 else:
-    obj_f_base = libfinder_env.StaticObject(target = 'libfinder_finder_client_base',
-                                       source = '$BUILDDIR/xrl/targets/finder_base.cc')
-    obj_f_cxif = libfinder_env.StaticObject(target = 'libfinder_finder_client_xif',
-                                        source = '$BUILDDIR/xrl/interfaces/finder_client_xif.cc')
-    obj_f_eoxif = libfinder_env.StaticObject(target = 'libfinder_finder_event_observer_xif',
-                                        source = '$BUILDDIR/xrl/interfaces/finder_event_observer_xif.cc')
+    obj_f_base = libfinder_env.StaticObject(
+	target = 'libfinder_finder_client_base',
+	source = '$BUILDDIR/xrl/targets/finder_base.cc')
+    obj_f_cxif = libfinder_env.StaticObject(
+	target = 'libfinder_finder_client_xif',
+	source = '$BUILDDIR/xrl/interfaces/finder_client_xif.cc')
+    obj_f_eoxif = libfinder_env.StaticObject(
+	target = 'libfinder_finder_event_observer_xif',
+	source = '$BUILDDIR/xrl/interfaces/finder_event_observer_xif.cc')
     libfinder_sources += [ obj_f_base, obj_f_cxif, obj_f_eoxif ]
 
 # library target
 if is_shared:
-    libfinder = libfinder_env.SharedLibrary(target = 'libfinder',
+    libfinder = libfinder_env.SharedLibrary(target = 'libxorp_finder',
                                             source = libfinder_sources)
     env.Alias('install',
               env.InstallLibrary('$libdir', libfinder))
 else:
-    libfinder = libfinder_env.StaticLibrary(target = 'libfinder',
+    libfinder = libfinder_env.StaticLibrary(target = 'libxorp_finder',
                                             source = libfinder_sources)
 
 #
@@ -181,8 +187,8 @@
     ])
 
 env.AppendUnique(LIBS = [
-    'finder',
-    'xipc',
+    'xorp_finder',
+    'xorp_ipc',
     'xorp_comm',
     'xorp'
     ])

Modified: trunk/xorp/libxipc/tests/SConscript
===================================================================
--- trunk/xorp/libxipc/tests/SConscript	2009-11-27 06:38:43 UTC (rev 11608)
+++ trunk/xorp/libxipc/tests/SConscript	2009-11-27 06:53:35 UTC (rev 11609)
@@ -35,8 +35,8 @@
 	])
 
 env.AppendUnique(LIBS = [
-	'xipc',
-	'finder',
+	'xorp_ipc',
+	'xorp_finder',
 	'xorp',
 	'xorp_comm',
 	])

Modified: trunk/xorp/mld6igmp/SConscript
===================================================================
--- trunk/xorp/mld6igmp/SConscript	2009-11-27 06:38:43 UTC (rev 11608)
+++ trunk/xorp/mld6igmp/SConscript	2009-11-27 06:53:35 UTC (rev 11609)
@@ -56,7 +56,7 @@
     'mld6igmpbase',
     'xorp_mrt',
     'xorp_proto',
-    'xipc',
+    'xorp_ipc',
     'xorp',
     'xorp_comm'
 ])

Modified: trunk/xorp/ospf/SConscript
===================================================================
--- trunk/xorp/ospf/SConscript	2009-11-27 06:38:43 UTC (rev 11608)
+++ trunk/xorp/ospf/SConscript	2009-11-27 06:53:35 UTC (rev 11609)
@@ -64,7 +64,7 @@
     'fearawpkt4xif',
     'fearawpkt6xif',
     'feaifmgrmirrorbase',
-    'xipc',
+    'xorp_ipc',
     'xorp',
     'xorp_proto',
     'xorp_comm',

Modified: trunk/xorp/ospf/tests/SConscript
===================================================================
--- trunk/xorp/ospf/tests/SConscript	2009-11-27 06:38:43 UTC (rev 11608)
+++ trunk/xorp/ospf/tests/SConscript	2009-11-27 06:53:35 UTC (rev 11609)
@@ -54,7 +54,7 @@
 	'fearawpkt6xif',
 	'policybackend',
 	'policycommon',
-	'xipc',
+	'xorp_ipc',
 	'xorp_proto',
 	'xorp',
 	'xorp_comm',

Modified: trunk/xorp/ospf/tools/SConscript
===================================================================
--- trunk/xorp/ospf/tools/SConscript	2009-11-27 06:38:43 UTC (rev 11608)
+++ trunk/xorp/ospf/tools/SConscript	2009-11-27 06:53:35 UTC (rev 11609)
@@ -42,7 +42,7 @@
 env.AppendUnique(LIBS = [
     'ospfv2xif',
     'ospfv3xif',
-    'xipc',
+    'xorp_ipc',
     'xorp',
     'xorp_proto',
     'xorp_comm',

Modified: trunk/xorp/pim/SConscript
===================================================================
--- trunk/xorp/pim/SConscript	2009-11-27 06:38:43 UTC (rev 11608)
+++ trunk/xorp/pim/SConscript	2009-11-27 06:53:35 UTC (rev 11609)
@@ -59,7 +59,7 @@
     'pimbase',
     'xorp_mrt',
     'xorp_proto',
-    'xipc',
+    'xorp_ipc',
     'xorp',
     'xorp_comm'
 ])

Modified: trunk/xorp/policy/SConscript
===================================================================
--- trunk/xorp/policy/SConscript	2009-11-27 06:38:43 UTC (rev 11608)
+++ trunk/xorp/policy/SConscript	2009-11-27 06:53:35 UTC (rev 11609)
@@ -55,7 +55,7 @@
     'policybackendxif',
     'findereventnotifierxif',
     'ribxif',
-    'xipc',
+    'xorp_ipc',
     'xorp',
     'xorp_proto',
     'xorp_comm'

Modified: trunk/xorp/rib/SConscript
===================================================================
--- trunk/xorp/rib/SConscript	2009-11-27 06:38:43 UTC (rev 11608)
+++ trunk/xorp/rib/SConscript	2009-11-27 06:53:35 UTC (rev 11609)
@@ -69,7 +69,7 @@
     'policybackend',
     'policycommon',
     'finder',
-    'xipc',
+    'xorp_ipc',
     'xorp',
     'xorp_proto',
     'xorp_comm'

Modified: trunk/xorp/rib/tests/SConscript
===================================================================
--- trunk/xorp/rib/tests/SConscript	2009-11-27 06:38:43 UTC (rev 11608)
+++ trunk/xorp/rib/tests/SConscript	2009-11-27 06:53:35 UTC (rev 11609)
@@ -65,7 +65,7 @@
 	'policycommon',
 	'xorp_proto',
 	'finder',
-	'xipc',
+	'xorp_ipc',
 	'xorp',
 	'xorp_comm',
 	])

Modified: trunk/xorp/rib/tools/SConscript
===================================================================
--- trunk/xorp/rib/tools/SConscript	2009-11-27 06:38:43 UTC (rev 11608)
+++ trunk/xorp/rib/tools/SConscript	2009-11-27 06:53:35 UTC (rev 11609)
@@ -42,7 +42,7 @@
     'ribxif',
     'showdistancesbase',
     'showroutesbase',
-    'xipc',
+    'xorp_ipc',
     'xorp',
     'xorp_proto',
     'xorp_comm',

Modified: trunk/xorp/rip/SConscript
===================================================================
--- trunk/xorp/rip/SConscript	2009-11-27 06:38:43 UTC (rev 11608)
+++ trunk/xorp/rip/SConscript	2009-11-27 06:53:35 UTC (rev 11609)
@@ -122,7 +122,7 @@
     'policybackend',
     'policycommon',
     'xorp_proto',
-    'xipc',
+    'xorp_ipc',
     'xorp_comm',
     'xorp',
 ])
@@ -192,7 +192,7 @@
     'policybackend',
     'policycommon',
     'xorp_proto',
-    'xipc',
+    'xorp_ipc',
     'xorp_comm',
     'xorp',
 ])

Modified: trunk/xorp/rip/tests/SConscript
===================================================================
--- trunk/xorp/rip/tests/SConscript	2009-11-27 06:38:43 UTC (rev 11608)
+++ trunk/xorp/rip/tests/SConscript	2009-11-27 06:53:35 UTC (rev 11609)
@@ -55,7 +55,7 @@
 	'socket4xif',
 	'policybackend',
 	'policycommon',
-	'xipc',
+	'xorp_ipc',
 	'xorp',
 	'xorp_comm',
 	])

Modified: trunk/xorp/rip/tools/SConscript
===================================================================
--- trunk/xorp/rip/tools/SConscript	2009-11-27 06:38:43 UTC (rev 11608)
+++ trunk/xorp/rip/tools/SConscript	2009-11-27 06:53:35 UTC (rev 11609)
@@ -40,7 +40,7 @@
 env.AppendUnique(LIBS = [
     'ripxif',
     'ripngxif',
-    'xipc',
+    'xorp_ipc',
     'xorp',
     'xorp_proto',
     'xorp_comm',

Modified: trunk/xorp/rtrmgr/SConscript
===================================================================
--- trunk/xorp/rtrmgr/SConscript	2009-11-27 06:38:43 UTC (rev 11608)
+++ trunk/xorp/rtrmgr/SConscript	2009-11-27 06:53:35 UTC (rev 11609)
@@ -139,7 +139,7 @@
     'rtrmgrclientxif',
     'findereventnotifierxif',
     'finder',
-    'xipc',
+    'xorp_ipc',
     'xorp_comm',
     'xorp'
 ])
@@ -168,7 +168,7 @@
     'rtrmgrxif',
     'xorpshbase',
     'findereventnotifierxif',
-    'xipc',
+    'xorp_ipc',
     'xorp_comm',
     'xorp',
     'curses'	# XXX only for non-windows
@@ -193,7 +193,7 @@
     'profilexif',
     'profilerbase',
     'finder',
-    'xipc',
+    'xorp_ipc',
     'xorp_comm',
     'xorp'
 ])

Modified: trunk/xorp/rtrmgr/tests/SConscript
===================================================================
--- trunk/xorp/rtrmgr/tests/SConscript	2009-11-27 06:38:43 UTC (rev 11608)
+++ trunk/xorp/rtrmgr/tests/SConscript	2009-11-27 06:53:35 UTC (rev 11609)
@@ -42,7 +42,7 @@
 env.AppendUnique(LIBS = [
 	'rtrmgr',
 	'finder',
-	'xipc',
+	'xorp_ipc',
 	'xorp',
 	'xorp_comm',
 	])

Modified: trunk/xorp/static_routes/SConscript
===================================================================
--- trunk/xorp/static_routes/SConscript	2009-11-27 06:38:43 UTC (rev 11608)
+++ trunk/xorp/static_routes/SConscript	2009-11-27 06:53:35 UTC (rev 11609)
@@ -54,7 +54,7 @@
     'findereventnotifierxif',
     'policybackend',
     'policycommon',
-    'xipc',
+    'xorp_ipc',
     'xorp',
     'xorp_proto',
     'xorp_comm',

Modified: trunk/xorp/vrrp/SConscript
===================================================================
--- trunk/xorp/vrrp/SConscript	2009-11-27 06:38:43 UTC (rev 11608)
+++ trunk/xorp/vrrp/SConscript	2009-11-27 06:53:35 UTC (rev 11609)
@@ -55,7 +55,7 @@
     'fearawlinkxif',
     'fearawpkt4xif',
     'feaifmgrmirrorbase',
-    'xipc',
+    'xorp_ipc',
     'xorp',
     'xorp_proto',
     'xorp_comm'


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



More information about the Xorp-cvs mailing list