[Xorp-cvs] SF.net SVN: xorp:[11623] trunk/xorp
bms_fbsd at users.sourceforge.net
bms_fbsd at users.sourceforge.net
Fri Nov 27 01:04:37 PST 2009
Revision: 11623
http://xorp.svn.sourceforge.net/xorp/?rev=11623&view=rev
Author: bms_fbsd
Date: 2009-11-27 09:04:36 +0000 (Fri, 27 Nov 2009)
Log Message:
-----------
New naming convention for XRL proxy/stub class libraries:
libxif_<foo>.so -- XRL client proxy class
libxst_<foo>.so -- XRL target stub class
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/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/static_routes/SConscript
trunk/xorp/vrrp/SConscript
trunk/xorp/xrl/interfaces/SConscript
trunk/xorp/xrl/targets/SConscript
Modified: trunk/xorp/bgp/SConscript
===================================================================
--- trunk/xorp/bgp/SConscript 2009-11-27 08:05:11 UTC (rev 11622)
+++ trunk/xorp/bgp/SConscript 2009-11-27 09:04:36 UTC (rev 11623)
@@ -55,13 +55,13 @@
'xorp_policy_backend',
'xorp_policy_common',
'xorp_fea_client',
- 'bgpbase',
- 'feaifmgrmirrorbase',
- 'ribxif',
- 'findereventnotifierxif',
- 'profileclientxif',
- 'feaifmgrmirrorxif',
- 'feaifmgrreplicatorxif',
+ 'xst_bgp',
+ 'xst_fea_ifmgr_mirror',
+ 'xif_rib',
+ 'xif_finder_event_notifier',
+ 'xif_profile_client',
+ 'xif_fea_ifmgr_mirror',
+ 'xif_fea_ifmgr_replicator',
'xorp_ipc',
'xorp_core',
'xorp_comm',
Modified: trunk/xorp/bgp/harness/SConscript
===================================================================
--- trunk/xorp/bgp/harness/SConscript 2009-11-27 08:05:11 UTC (rev 11622)
+++ trunk/xorp/bgp/harness/SConscript 2009-11-27 09:04:36 UTC (rev 11623)
@@ -37,7 +37,7 @@
])
env.AppendUnique(LIBS = [
- 'bgpxif',
+ 'xif_bgp',
'xorp_ipc',
'xorp_core',
'xorp_comm',
Modified: trunk/xorp/bgp/tests/SConscript
===================================================================
--- trunk/xorp/bgp/tests/SConscript 2009-11-27 08:05:11 UTC (rev 11622)
+++ trunk/xorp/bgp/tests/SConscript 2009-11-27 09:04:36 UTC (rev 11623)
@@ -44,16 +44,16 @@
env.AppendUnique(LIBS = [
'xorp_ospf',
- #'ospfv2base',
- #'ospfv3base',
- 'ripxif',
- 'findereventnotifierxif',
+ #'xst_ospfv2',
+ #'xst_ospfv3',
+ 'xif_rip',
+ 'xif_finder_event_notifier',
'xorp_fea_client',
- 'feaifmgrmirrorxif',
- 'feaifmgrreplicatorxif',
- 'feaifmgrmirrorbase',
- 'fearawpkt4xif',
- 'fearawpkt6xif',
+ 'xif_fea_ifmgr_mirror',
+ 'xif_fea_ifmgr_replicator',
+ 'xst_fea_ifmgr_mirror',
+ 'xif_fea_rawpkt4',
+ 'xif_fea_rawpkt6',
'xorp_policy_backend',
'xorp_policy_common',
'xorp_ipc',
Modified: trunk/xorp/bgp/tools/SConscript
===================================================================
--- trunk/xorp/bgp/tools/SConscript 2009-11-27 08:05:11 UTC (rev 11622)
+++ trunk/xorp/bgp/tools/SConscript 2009-11-27 09:04:36 UTC (rev 11623)
@@ -39,7 +39,7 @@
env.AppendUnique(LIBS = [
'xorp_bgp', # for ASPath
- 'bgpxif',
+ 'xif_bgp',
'xorp_ipc',
'xorp_core',
'xorp_comm',
Modified: trunk/xorp/cli/SConscript
===================================================================
--- trunk/xorp/cli/SConscript 2009-11-27 08:05:11 UTC (rev 11622)
+++ trunk/xorp/cli/SConscript 2009-11-27 09:04:36 UTC (rev 11623)
@@ -47,8 +47,8 @@
])
env.AppendUnique(LIBS = [
- 'cliprocessorxif',
- 'clibase',
+ 'xif_cli_processor',
+ 'xst_cli',
'xorp_tecla',
'xorp_proto',
'xorp_ipc',
Modified: trunk/xorp/cli/tests/SConscript
===================================================================
--- trunk/xorp/cli/tests/SConscript 2009-11-27 08:05:11 UTC (rev 11622)
+++ trunk/xorp/cli/tests/SConscript 2009-11-27 09:04:36 UTC (rev 11623)
@@ -42,8 +42,8 @@
env.AppendUnique(LIBS = [
'xorp_cli',
- 'cliprocessorxif',
- 'clibase',
+ 'xif_cli_processor',
+ 'xst_cli',
'xorp_finder',
'xorp_tecla',
'xorp_ipc',
Modified: trunk/xorp/cli/tools/SConscript
===================================================================
--- trunk/xorp/cli/tools/SConscript 2009-11-27 08:05:11 UTC (rev 11622)
+++ trunk/xorp/cli/tools/SConscript 2009-11-27 09:04:36 UTC (rev 11623)
@@ -38,7 +38,7 @@
])
env.AppendUnique(LIBS = [
- 'cliprocessorxif',
+ 'xif_cli_processor',
'xorp_ipc',
'xorp_core',
'xorp_proto',
Modified: trunk/xorp/contrib/mld6igmp_lite/SConscript
===================================================================
--- trunk/xorp/contrib/mld6igmp_lite/SConscript 2009-11-27 08:05:11 UTC (rev 11622)
+++ trunk/xorp/contrib/mld6igmp_lite/SConscript 2009-11-27 09:04:36 UTC (rev 11623)
@@ -46,15 +46,15 @@
env.AppendUnique(LIBS = [
'mld6igmp',
'xorp_fea_client',
- 'mld6igmpclientxif',
- 'fearawpkt4xif',
- 'fearawpkt6xif',
- 'feaifmgrmirrorxif',
- 'feaifmgrreplicatorxif',
- 'climanagerxif',
- 'findereventnotifierxif',
- 'feaifmgrmirrorbase',
- 'mld6igmpbase',
+ 'xif_mld6igmp_client',
+ 'xif_fea_rawpkt4',
+ 'xif_fea_rawpkt6',
+ 'xif_fea_ifmgr_mirror',
+ 'xif_fea_ifmgr_replicator',
+ 'xif_cli_manager',
+ 'xif_finder_event_notifier',
+ 'xst_fea_ifmgr_mirror',
+ 'xst_mld6igmp',
'xorp_mrt',
'xorp_ipc',
'xorp_core',
Modified: trunk/xorp/contrib/olsr/SConscript
===================================================================
--- trunk/xorp/contrib/olsr/SConscript 2009-11-27 08:05:11 UTC (rev 11622)
+++ trunk/xorp/contrib/olsr/SConscript 2009-11-27 09:04:36 UTC (rev 11623)
@@ -51,18 +51,18 @@
env.AppendUnique(LIBS = [
'olsr',
- 'olsr4base',
+ 'xst_olsr4',
'xorp_policy_backend',
'xorp_policy_common',
'xorp_fea_client',
- 'ribxif',
- 'findereventnotifierxif',
- 'feaifmgrmirrorxif',
- 'feaifmgrreplicatorxif',
- 'profileclientxif',
- 'fearawpkt4xif',
- 'fearawpkt6xif',
- 'feaifmgrmirrorbase',
+ 'xif_rib',
+ 'xif_finder_event_notifier',
+ 'xif_fea_ifmgr_mirror',
+ 'xif_fea_ifmgr_replicator',
+ 'xif_profile_client',
+ 'xif_fea_rawpkt4',
+ 'xif_fea_rawpkt6',
+ 'xst_fea_ifmgr_mirror',
'xorp_ipc',
'xorp_core',
'xorp_proto',
Modified: trunk/xorp/fea/SConscript
===================================================================
--- trunk/xorp/fea/SConscript 2009-11-27 08:05:11 UTC (rev 11622)
+++ trunk/xorp/fea/SConscript 2009-11-27 09:04:36 UTC (rev 11623)
@@ -81,25 +81,25 @@
libxorp_fea_linkorder.append('libxorp_fea_data_plane_base')
libxorp_fea_linkorder += [
- 'feafibclientxif',
- 'fearawlinkclientxif',
- 'fearawpkt4clientxif',
- 'fearawpkt6clientxif',
- 'socket4userxif',
- 'socket6userxif',
- 'findereventnotifierxif',
+ 'xif_fea_fib_client',
+ 'xif_fea_rawlink_client',
+ 'xif_fea_rawpkt4_client',
+ 'xif_fea_rawpkt6_client',
+ 'xif_socket4_user',
+ 'xif_socket6_user',
+ 'xif_finder_event_notifier',
'xorp_cli',
- 'cliprocessorxif',
+ 'xif_cli_processor',
'xorp_fea_client',
- 'feaifmgrmirrorxif', # XXX?
- 'feaifmgrreplicatorxif', # XXX?
- 'feaifmgrmirrorbase', # XXX?
- 'climanagerxif',
- 'mfeaclientxif',
- 'profileclientxif',
- 'clibase',
- 'feabase',
- 'mfeabase',
+ 'xif_fea_ifmgr_mirror', # XXX?
+ 'xif_fea_ifmgr_replicator', # XXX?
+ 'xst_fea_ifmgr_mirror', # XXX?
+ 'xif_cli_manager',
+ 'xif_mfea_client',
+ 'xif_profile_client',
+ 'xst_cli',
+ 'xst_fea',
+ 'xst_mfea',
'xorp_mrt',
'xorp_tecla',
'xorp_proto',
Modified: trunk/xorp/fea/tests/SConscript
===================================================================
--- trunk/xorp/fea/tests/SConscript 2009-11-27 08:05:11 UTC (rev 11622)
+++ trunk/xorp/fea/tests/SConscript 2009-11-27 09:04:36 UTC (rev 11623)
@@ -67,25 +67,25 @@
libxorp_fea_linkorder.append('libxorp_fea_data_plane_base')
libxorp_fea_linkorder += [
- 'feafibclientxif',
- 'fearawlinkclientxif',
- 'fearawpkt4clientxif',
- 'fearawpkt6clientxif',
- 'socket4userxif',
- 'socket6userxif',
- 'findereventnotifierxif',
+ 'xif_fea_fib_client',
+ 'xif_fea_rawlink_client',
+ 'xif_fea_rawpkt4_client',
+ 'xif_fea_rawpkt6_client',
+ 'xif_socket4_user',
+ 'xif_socket6_user',
+ 'xif_finder_event_notifier',
'xorp_cli',
- 'cliprocessorxif',
+ 'xif_cli_processor',
'xorp_fea_client',
- 'feaifmgrmirrorxif', # XXX?
- 'feaifmgrreplicatorxif', # XXX?
- 'feaifmgrmirrorbase', # XXX?
- 'climanagerxif',
- 'mfeaclientxif',
- 'profileclientxif',
- 'clibase',
- 'feabase',
- 'mfeabase',
+ 'xif_fea_ifmgr_mirror', # XXX?
+ 'xif_fea_ifmgr_replicator', # XXX?
+ 'xst_fea_ifmgr_mirror', # XXX?
+ 'xif_cli_manager',
+ 'xif_mfea_client',
+ 'xif_profile_client',
+ 'xst_cli',
+ 'xst_fea',
+ 'xst_mfea',
'xorp_mrt',
'xorp_tecla',
'xorp_proto',
Modified: trunk/xorp/fea/tools/SConscript
===================================================================
--- trunk/xorp/fea/tools/SConscript 2009-11-27 08:05:11 UTC (rev 11622)
+++ trunk/xorp/fea/tools/SConscript 2009-11-27 09:04:36 UTC (rev 11623)
@@ -40,9 +40,9 @@
env.AppendUnique(LIBS = [
'xorp_fea_client',
- 'feaifmgrmirrorxif',
- 'feaifmgrreplicatorxif',
- 'feaifmgrmirrorbase',
+ 'xif_fea_ifmgr_mirror',
+ 'xif_fea_ifmgr_replicator',
+ 'xst_fea_ifmgr_mirror',
'xorp_ipc',
'xorp_core',
'xorp_proto',
Modified: trunk/xorp/fib2mrib/SConscript
===================================================================
--- trunk/xorp/fib2mrib/SConscript 2009-11-27 08:05:11 UTC (rev 11622)
+++ trunk/xorp/fib2mrib/SConscript 2009-11-27 09:04:36 UTC (rev 11623)
@@ -43,34 +43,40 @@
])
env.AppendUnique(LIBS = [
- 'fib2mrib',
- 'fib2mribbase',
+ 'xorp_fib2mrib',
+ 'xst_fib2mrib',
'xorp_policy_backend',
'xorp_policy_common',
'xorp_fea_client',
- 'findereventnotifierxif',
- 'feaifmgrmirrorxif',
- 'feaifmgrreplicatorxif',
- 'ftixif',
- 'feafibxif',
- 'ribxif',
- 'feaifmgrmirrorbase',
+ 'xif_finder_event_notifier',
+ 'xif_fea_ifmgr_mirror',
+ 'xif_fea_ifmgr_replicator',
+ 'xif_fti',
+ 'xif_fea_fib',
+ 'xif_rib',
+ 'xst_fea_ifmgr_mirror',
'xorp_ipc',
'xorp_core',
'xorp_proto',
'xorp_comm'
])
-libfib2mribsrcs = [
+libxorp_fib2mrib_srcs = [
'fib2mrib_node.cc',
'fib2mrib_varrw.cc',
'xrl_fib2mrib_node.cc'
]
if is_shared:
- libfib2mrib = env.SharedLibrary(target = 'libfib2mrib', source = libfib2mribsrcs, LIBS = '')
+ libxorp_fib2mrib = env.SharedLibrary(
+ target = 'libxorp_fib2mrib',
+ source = libxorp_fib2mrib_srcs,
+ LIBS = '')
else:
- libfib2mrib = env.StaticLibrary(target = 'libfib2mrib', source = libfib2mribsrcs, LIBS = '')
+ libxorp_fib2mrib = env.StaticLibrary(
+ target = 'libxorp_fib2mrib',
+ source = libxorp_fib2mrib_srcs,
+ LIBS = '')
fib2mribsrcs = [
'xorp_fib2mrib.cc',
@@ -86,6 +92,6 @@
if is_shared:
env.Alias('install',
- env.InstallLibrary('$libdir', libfib2mrib))
+ env.InstallLibrary('$libdir', libxorp_fib2mrib))
Default(fib2mrib)
Modified: trunk/xorp/libfeaclient/tests/SConscript
===================================================================
--- trunk/xorp/libfeaclient/tests/SConscript 2009-11-27 08:05:11 UTC (rev 11622)
+++ trunk/xorp/libfeaclient/tests/SConscript 2009-11-27 09:04:36 UTC (rev 11623)
@@ -42,9 +42,9 @@
# XXX Can we inherit these from libfeaclient deps?
env.AppendUnique(LIBS = [
'xorp_fea_client',
- 'feaifmgrmirrorxif',
- 'feaifmgrreplicatorxif',
- 'feaifmgrmirrorbase',
+ 'xif_fea_ifmgr_mirror',
+ 'xif_fea_ifmgr_replicator',
+ 'xst_fea_ifmgr_mirror',
'xorp_ipc',
'xorp_core',
'xorp_comm',
@@ -55,11 +55,11 @@
env = env.Clone()
env.PrependUnique(LIBS = [
- 'testfeaifmgrmirrorbase',
- 'feaifmgrreplicatorxif',
+ 'xst_test_fea_ifmgr_mirror',
+ 'xif_fea_ifmgr_replicator',
'xorp_finder',
- 'ribxif',
- 'ribclientbase',
+ 'xif_rib',
+ 'xst_ribclient',
])
test_remote_copy = env.AutoTest(target = 'test_remote_copy',
source = 'test_remote_copy.cc')
Modified: trunk/xorp/mld6igmp/SConscript
===================================================================
--- trunk/xorp/mld6igmp/SConscript 2009-11-27 08:05:11 UTC (rev 11622)
+++ trunk/xorp/mld6igmp/SConscript 2009-11-27 09:04:36 UTC (rev 11623)
@@ -45,15 +45,15 @@
env.AppendUnique(LIBS = [
'mld6igmp',
'xorp_fea_client',
- 'mld6igmpclientxif',
- 'fearawpkt4xif',
- 'fearawpkt6xif',
- 'feaifmgrmirrorxif',
- 'feaifmgrreplicatorxif',
- 'climanagerxif',
- 'findereventnotifierxif',
- 'feaifmgrmirrorbase',
- 'mld6igmpbase',
+ 'xif_mld6igmp_client',
+ 'xif_fea_rawpkt4',
+ 'xif_fea_rawpkt6',
+ 'xif_fea_ifmgr_mirror',
+ 'xif_fea_ifmgr_replicator',
+ 'xif_cli_manager',
+ 'xif_finder_event_notifier',
+ 'xst_fea_ifmgr_mirror',
+ 'xst_mld6igmp',
'xorp_mrt',
'xorp_proto',
'xorp_ipc',
Modified: trunk/xorp/ospf/SConscript
===================================================================
--- trunk/xorp/ospf/SConscript 2009-11-27 08:05:11 UTC (rev 11622)
+++ trunk/xorp/ospf/SConscript 2009-11-27 09:04:36 UTC (rev 11623)
@@ -51,19 +51,19 @@
env.AppendUnique(LIBS = [
'xorp_ospf', # Refers to the library, not the executable.
- 'ospfv2base',
- 'ospfv3base',
+ 'xst_ospfv2',
+ 'xst_ospfv3',
'xorp_policy_backend',
'xorp_policy_common',
'xorp_fea_client',
- 'ribxif',
- 'findereventnotifierxif',
- 'feaifmgrmirrorxif',
- 'feaifmgrreplicatorxif',
- 'profileclientxif',
- 'fearawpkt4xif',
- 'fearawpkt6xif',
- 'feaifmgrmirrorbase',
+ 'xif_rib',
+ 'xif_finder_event_notifier',
+ 'xif_fea_ifmgr_mirror',
+ 'xif_fea_ifmgr_replicator',
+ 'xif_profile_client',
+ 'xif_fea_rawpkt4',
+ 'xif_fea_rawpkt6',
+ 'xst_fea_ifmgr_mirror',
'xorp_ipc',
'xorp_core',
'xorp_proto',
Modified: trunk/xorp/ospf/tests/SConscript
===================================================================
--- trunk/xorp/ospf/tests/SConscript 2009-11-27 08:05:11 UTC (rev 11622)
+++ trunk/xorp/ospf/tests/SConscript 2009-11-27 09:04:36 UTC (rev 11623)
@@ -44,14 +44,14 @@
])
env.AppendUnique(LIBS = [
- 'ribxif',
- 'findereventnotifierxif',
+ 'xif_rib',
+ 'xif_finder_event_notifier',
'xorp_fea_client',
- 'feaifmgrmirrorxif',
- 'feaifmgrreplicatorxif',
- 'feaifmgrmirrorbase',
- 'fearawpkt4xif',
- 'fearawpkt6xif',
+ 'xif_fea_ifmgr_mirror',
+ 'xif_fea_ifmgr_replicator',
+ 'xst_fea_ifmgr_mirror',
+ 'xif_fea_rawpkt4',
+ 'xif_fea_rawpkt6',
'xorp_policy_backend',
'xorp_policy_common',
'xorp_ipc',
@@ -63,8 +63,8 @@
# XXX Do we need to link against this now?
if is_shared:
env.PrependUnique(LIBS = [
- 'ospfv2base',
- 'ospfv3base',
+ 'xst_ospfv2',
+ 'xst_ospfv3',
])
env.PrependUnique(LIBS = [
Modified: trunk/xorp/ospf/tools/SConscript
===================================================================
--- trunk/xorp/ospf/tools/SConscript 2009-11-27 08:05:11 UTC (rev 11622)
+++ trunk/xorp/ospf/tools/SConscript 2009-11-27 09:04:36 UTC (rev 11623)
@@ -40,8 +40,8 @@
])
env.AppendUnique(LIBS = [
- 'ospfv2xif',
- 'ospfv3xif',
+ 'xif_ospfv2',
+ 'xif_ospfv3',
'xorp_ipc',
'xorp_core',
'xorp_proto',
Modified: trunk/xorp/pim/SConscript
===================================================================
--- trunk/xorp/pim/SConscript 2009-11-27 08:05:11 UTC (rev 11622)
+++ trunk/xorp/pim/SConscript 2009-11-27 09:04:36 UTC (rev 11623)
@@ -46,17 +46,17 @@
env.AppendUnique(LIBS = [
'xorp_pim', # The library, not the executable.
'xorp_fea_client',
- 'ribxif',
- 'mld6igmpxif',
- 'mfeaxif',
- 'fearawpkt4xif',
- 'fearawpkt6xif',
- 'feaifmgrmirrorxif',
- 'feaifmgrreplicatorxif',
- 'climanagerxif',
- 'findereventnotifierxif',
- 'feaifmgrmirrorbase',
- 'pimbase',
+ 'xif_rib',
+ 'xif_mld6igmp',
+ 'xif_mfea',
+ 'xif_fea_rawpkt4',
+ 'xif_fea_rawpkt6',
+ 'xif_fea_ifmgr_mirror',
+ 'xif_fea_ifmgr_replicator',
+ 'xif_cli_manager',
+ 'xif_finder_event_notifier',
+ 'xst_fea_ifmgr_mirror',
+ 'xst_pim',
'xorp_mrt',
'xorp_proto',
'xorp_ipc',
Modified: trunk/xorp/policy/SConscript
===================================================================
--- trunk/xorp/policy/SConscript 2009-11-27 08:05:11 UTC (rev 11622)
+++ trunk/xorp/policy/SConscript 2009-11-27 09:04:36 UTC (rev 11623)
@@ -51,10 +51,10 @@
'xorp_policy',
'xorp_policy_backend',
'xorp_policy_common',
- 'policybase',
- 'policybackendxif',
- 'findereventnotifierxif',
- 'ribxif',
+ 'xst_policy',
+ 'xif_policy_backend',
+ 'xif_finder_event_notifier',
+ 'xif_rib',
'xorp_ipc',
'xorp_core',
'xorp_proto',
Modified: trunk/xorp/rib/SConscript
===================================================================
--- trunk/xorp/rib/SConscript 2009-11-27 08:05:11 UTC (rev 11622)
+++ trunk/xorp/rib/SConscript 2009-11-27 09:04:36 UTC (rev 11623)
@@ -52,20 +52,20 @@
env.AppendUnique(LIBS = [
'xorp_rib', # The library, not the executable.
'xorp_fea_client',
- 'feaifmgrmirrorxif',
- 'feaifmgrreplicatorxif',
- 'ftixif',
- 'ribclientxif',
- 'findereventnotifierxif',
- 'redist4xif',
- 'redist6xif',
- 'redisttransaction4xif',
- 'redisttransaction6xif',
- 'policyredist4xif',
- 'policyredist6xif',
- 'profileclientxif',
- 'feaifmgrmirrorbase',
- 'ribbase',
+ 'xif_fea_ifmgr_mirror',
+ 'xif_fea_ifmgr_replicator',
+ 'xif_fti',
+ 'xif_rib_client',
+ 'xif_finder_event_notifier',
+ 'xif_redist4',
+ 'xif_redist6',
+ 'xif_redist_transaction4',
+ 'xif_redist_transaction6',
+ 'xif_policy_redist4',
+ 'xif_policy_redist6',
+ 'xif_profile_client',
+ 'xst_fea_ifmgr_mirror',
+ 'xst_rib',
'xorp_policy_backend',
'xorp_policy_common',
'xorp_finder',
Modified: trunk/xorp/rib/tests/SConscript
===================================================================
--- trunk/xorp/rib/tests/SConscript 2009-11-27 08:05:11 UTC (rev 11622)
+++ trunk/xorp/rib/tests/SConscript 2009-11-27 09:04:36 UTC (rev 11623)
@@ -47,20 +47,20 @@
'xorp_rib',
#'xorp_rib_xrl', #notyet
'xorp_fea_client',
- 'feaifmgrmirrorxif',
- 'feaifmgrreplicatorxif',
- 'ftixif',
- 'ribclientxif',
- 'findereventnotifierxif',
- 'redist4xif',
- 'redist6xif',
- 'redisttransaction4xif',
- 'redisttransaction6xif',
- 'policyredist4xif',
- 'policyredist6xif',
- 'profileclientxif',
- 'feaifmgrmirrorbase',
- 'ribbase',
+ 'xif_fea_ifmgr_mirror',
+ 'xif_fea_ifmgr_replicator',
+ 'xif_fti',
+ 'xif_rib_client',
+ 'xif_finder_event_notifier',
+ 'xif_redist4',
+ 'xif_redist6',
+ 'xif_redist_transaction4',
+ 'xif_redist_transaction6',
+ 'xif_policy_redist4',
+ 'xif_policy_redist6',
+ 'xif_profile_client',
+ 'xst_fea_ifmgr_mirror',
+ 'xst_rib',
'xorp_policy_backend',
'xorp_policy_common',
'xorp_proto',
@@ -93,8 +93,8 @@
# XXX NOTYET: part of compound test, scripting needed.
#env = env.Clone()
#env.AppendUnique(LIBS = [
-# 'ribxif',
-# 'ribclientbase',
+# 'xif_rib',
+# 'xst_ribclient',
# ])
#test_register_xrls = env.AutoTest(target = 'test_register_xrls',
# source = 'test_register_xrls.cc')
Modified: trunk/xorp/rib/tools/SConscript
===================================================================
--- trunk/xorp/rib/tools/SConscript 2009-11-27 08:05:11 UTC (rev 11622)
+++ trunk/xorp/rib/tools/SConscript 2009-11-27 09:04:36 UTC (rev 11623)
@@ -38,10 +38,10 @@
])
env.AppendUnique(LIBS = [
- 'findereventnotifierxif',
- 'ribxif',
- 'showdistancesbase',
- 'showroutesbase',
+ 'xif_finder_event_notifier',
+ 'xif_rib',
+ 'xst_show_distances',
+ 'xst_show_routes',
'xorp_ipc',
'xorp_core',
'xorp_proto',
Modified: trunk/xorp/rip/SConscript
===================================================================
--- trunk/xorp/rip/SConscript 2009-11-27 08:05:11 UTC (rev 11622)
+++ trunk/xorp/rip/SConscript 2009-11-27 09:04:36 UTC (rev 11623)
@@ -111,14 +111,14 @@
e.PrependUnique(LIBS = [
'xorp_rip_xrl',
'xorp_rip', # Refers to library, not the executable.
- 'ripbase',
- 'ribxif',
- 'findereventnotifierxif',
+ 'xst_rip',
+ 'xif_rib',
+ 'xif_finder_event_notifier',
'xorp_fea_client',
- 'feaifmgrmirrorxif',
- 'feaifmgrreplicatorxif',
- 'feaifmgrmirrorbase',
- 'socket4xif',
+ 'xif_fea_ifmgr_mirror',
+ 'xif_fea_ifmgr_replicator',
+ 'xst_fea_ifmgr_mirror',
+ 'xif_socket4',
'xorp_policy_backend',
'xorp_policy_common',
'xorp_proto',
@@ -181,14 +181,14 @@
e.PrependUnique(LIBS = [
'xorp_ripng_xrl',
'xorp_ripng',
- 'ripngbase',
- 'ribxif',
- 'findereventnotifierxif',
+ 'xst_ripng',
+ 'xif_rib',
+ 'xif_finder_event_notifier',
'xorp_fea_client',
- 'feaifmgrmirrorxif',
- 'feaifmgrreplicatorxif',
- 'feaifmgrmirrorbase',
- 'socket6xif',
+ 'xif_fea_ifmgr_mirror',
+ 'xif_fea_ifmgr_replicator',
+ 'xst_fea_ifmgr_mirror',
+ 'xif_socket6',
'xorp_policy_backend',
'xorp_policy_common',
'xorp_proto',
Modified: trunk/xorp/rip/tests/SConscript
===================================================================
--- trunk/xorp/rip/tests/SConscript 2009-11-27 08:05:11 UTC (rev 11622)
+++ trunk/xorp/rip/tests/SConscript 2009-11-27 09:04:36 UTC (rev 11623)
@@ -43,16 +43,16 @@
])
env.AppendUnique(LIBS = [
- 'ripbase',
+ 'xst_rip',
'xorp_rip',
'xorp_ripng',
- 'ripxif',
- 'findereventnotifierxif',
+ 'xif_rip',
+ 'xif_finder_event_notifier',
'xorp_fea_client',
- 'feaifmgrmirrorxif',
- 'feaifmgrreplicatorxif',
- 'feaifmgrmirrorbase',
- 'socket4xif',
+ 'xif_fea_ifmgr_mirror',
+ 'xif_fea_ifmgr_replicator',
+ 'xst_fea_ifmgr_mirror',
+ 'xif_socket4',
'xorp_policy_backend',
'xorp_policy_common',
'xorp_ipc',
Modified: trunk/xorp/rip/tools/SConscript
===================================================================
--- trunk/xorp/rip/tools/SConscript 2009-11-27 08:05:11 UTC (rev 11622)
+++ trunk/xorp/rip/tools/SConscript 2009-11-27 09:04:36 UTC (rev 11623)
@@ -38,8 +38,8 @@
])
env.AppendUnique(LIBS = [
- 'ripxif',
- 'ripngxif',
+ 'xif_rip',
+ 'xif_ripng',
'xorp_ipc',
'xorp_core',
'xorp_proto',
Modified: trunk/xorp/rtrmgr/SConscript
===================================================================
--- trunk/xorp/rtrmgr/SConscript 2009-11-27 08:05:11 UTC (rev 11622)
+++ trunk/xorp/rtrmgr/SConscript 2009-11-27 09:04:36 UTC (rev 11623)
@@ -135,9 +135,9 @@
rtrmgr_env.AppendUnique(LIBS = [
'xorp_rtrmgr',
- 'rtrmgrbase',
- 'rtrmgrclientxif',
- 'findereventnotifierxif',
+ 'xst_rtrmgr',
+ 'xif_rtrmgr_client',
+ 'xif_finder_event_notifier',
'xorp_finder',
'xorp_ipc',
'xorp_comm',
@@ -161,13 +161,13 @@
xorpsh_env.AppendUnique(LIBS = [
'xorp_rtrmgr',
'xorp_cli',
- 'clibase', # XXX Not picked up automagically?
- 'cliprocessorxif', # XXX ditto?
+ 'xst_cli', # XXX Not picked up automagically?
+ 'xif_cli_processor', # XXX ditto?
'xorp_proto',
'xorp_tecla',
- 'rtrmgrxif',
- 'xorpshbase',
- 'findereventnotifierxif',
+ 'xif_rtrmgr',
+ 'xst_xorpsh',
+ 'xif_finder_event_notifier',
'xorp_ipc',
'xorp_comm',
'xorp_core',
@@ -190,8 +190,8 @@
profiler_env = env.Clone()
profiler_env.AppendUnique(LIBS = [
- 'profilexif',
- 'profilerbase',
+ 'xif_profile',
+ 'xst_profiler',
'xorp_finder',
'xorp_ipc',
'xorp_comm',
Modified: trunk/xorp/static_routes/SConscript
===================================================================
--- trunk/xorp/static_routes/SConscript 2009-11-27 08:05:11 UTC (rev 11622)
+++ trunk/xorp/static_routes/SConscript 2009-11-27 09:04:36 UTC (rev 11623)
@@ -43,15 +43,15 @@
])
env.AppendUnique(LIBS = [
- 'staticroutes',
+ 'xorp_static_routes', # the library, not the executable
'xorp_fea_client',
- 'feaifmgrmirrorxif',
- 'feaifmgrreplicatorxif',
- 'findereventnotifierxif',
- 'feaifmgrmirrorbase',
- 'staticroutesbase',
- 'ribxif',
- 'findereventnotifierxif',
+ 'xif_fea_ifmgr_mirror',
+ 'xif_fea_ifmgr_replicator',
+ 'xif_finder_event_notifier',
+ 'xst_fea_ifmgr_mirror',
+ 'xst_static_routes',
+ 'xif_rib',
+ 'xif_finder_event_notifier',
'xorp_policy_backend',
'xorp_policy_common',
'xorp_ipc',
@@ -60,23 +60,29 @@
'xorp_comm',
])
-
-libsrsources = [
+libxorp_static_routes_srcs = [
'static_routes_node.cc',
'static_routes_varrw.cc',
'xrl_static_routes_node.cc'
]
-srsources = [
+xorp_static_routes_srcs = [
'xorp_static_routes.cc'
]
if is_shared:
- libsr = env.SharedLibrary(LIBS = '', target = 'libstaticroutes', source = libsrsources)
+ libxorp_static_routes = env.SharedLibrary(
+ target = 'libxorp_static_routes',
+ source = libxorp_static_routes_srcs,
+ LIBS = '')
else:
- libsr = env.StaticLibrary(LIBS = '', target = 'libstaticroutes', source = libsrsources)
+ libxorp_static_routes = env.StaticLibrary(
+ target = 'libxorp_static_routes',
+ source = libxorp_static_routes_srcs,
+ LIBS = '')
-xorp_static_routes = env.Program(target = 'xorp_static_routes', source = srsources)
+xorp_static_routes = env.Program(target = 'xorp_static_routes',
+ source = xorp_static_routes_srcs)
#srpath = '$bindir'
srpath = '$exec_prefix/static_routes'
@@ -86,6 +92,6 @@
if is_shared:
env.Alias('install',
- env.InstallLibrary('$libdir', libsr))
+ env.InstallLibrary('$libdir', libxorp_static_routes))
Default(xorp_static_routes)
Modified: trunk/xorp/vrrp/SConscript
===================================================================
--- trunk/xorp/vrrp/SConscript 2009-11-27 08:05:11 UTC (rev 11622)
+++ trunk/xorp/vrrp/SConscript 2009-11-27 09:04:36 UTC (rev 11623)
@@ -47,14 +47,14 @@
env.AppendUnique(LIBS = [
'xorp_vrrp',
- 'vrrpbase',
+ 'xst_vrrp',
'xorp_fea_client',
- 'feaifmgrxif',
- 'feaifmgrmirrorxif',
- 'feaifmgrreplicatorxif',
- 'fearawlinkxif',
- 'fearawpkt4xif',
- 'feaifmgrmirrorbase',
+ 'xif_fea_ifmgr',
+ 'xif_fea_ifmgr_mirror',
+ 'xif_fea_ifmgr_replicator',
+ 'xif_fea_rawlink',
+ 'xif_fea_rawpkt4',
+ 'xst_fea_ifmgr_mirror',
'xorp_ipc',
'xorp_core',
'xorp_proto',
Modified: trunk/xorp/xrl/interfaces/SConscript
===================================================================
--- trunk/xorp/xrl/interfaces/SConscript 2009-11-27 08:05:11 UTC (rev 11622)
+++ trunk/xorp/xrl/interfaces/SConscript 2009-11-27 09:04:36 UTC (rev 11623)
@@ -98,7 +98,7 @@
for xif in xifs:
base = xif[:-len('.xif')]
- tgt = 'lib' + base.translate(string.maketrans('',''),'_') + 'xif'
+ tgt = 'libxif_' + base
src = base + '_xif.cc'
env.CLNTGEN(xif)
Modified: trunk/xorp/xrl/targets/SConscript
===================================================================
--- trunk/xorp/xrl/targets/SConscript 2009-11-27 08:05:11 UTC (rev 11622)
+++ trunk/xorp/xrl/targets/SConscript 2009-11-27 09:04:36 UTC (rev 11623)
@@ -84,7 +84,7 @@
def BuildXrlTarget(tgt):
lib = None
base = tgt[:-len('.tgt')]
- target = 'lib' + base.translate(string.maketrans('',''),'_') + 'base'
+ target = 'libxst_' + base
source = base + '_base.cc'
env.TGTGEN(tgt)
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