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

[bms_fbsd at users.sourceforge.net]

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

Log Message:
-----------
libfinder => libxorp_finder
libcli => libxorp_cli
libtecla_xorp => libxorp_tecla

Modified Paths:
--------------
    trunk/xorp/cli/SConscript
    trunk/xorp/cli/libtecla/SConscript
    trunk/xorp/cli/tests/SConscript
    trunk/xorp/fea/SConscript
    trunk/xorp/fea/tests/SConscript
    trunk/xorp/rtrmgr/SConscript

Modified: trunk/xorp/cli/SConscript
===================================================================
--- trunk/xorp/cli/SConscript	2009-11-27 07:26:17 UTC (rev 11615)
+++ trunk/xorp/cli/SConscript	2009-11-27 07:32:31 UTC (rev 11616)
@@ -49,14 +49,14 @@
 env.AppendUnique(LIBS = [
     'cliprocessorxif',
     'clibase',
-    'tecla_xorp',
+    'xorp_tecla',
     'xorp_proto',
     'xorp_ipc',
     'xorp_comm',
     'xorp_core',
     ])
 
-libclisrcs = [
+libxorp_cli_srcs = [
     'cli_client.cc',
     'cli_command.cc',
     'cli_command_pipe.cc',
@@ -66,12 +66,13 @@
     'xrl_cli_node.cc'
     ]
 
-
 if is_shared:
-    libcli = env.SharedLibrary(target = 'libcli', source = libclisrcs)
+    libxorp_cli = env.SharedLibrary(target = 'libxorp_cli',
+				    source = libxorp_cli_srcs)
     env.Alias('install',
-              env.InstallLibrary('$libdir', libcli))
+              env.InstallLibrary('$libdir', libxorp_cli))
 else:
-    libcli = env.StaticLibrary(target = 'libcli', source = libclisrcs)
+    libxorp_cli = env.StaticLibrary(target = 'libxorp_cli',
+				    source = libxorp_cli_srcs)
 
-Default(libcli)
+Default(libxorp_cli)

Modified: trunk/xorp/cli/libtecla/SConscript
===================================================================
--- trunk/xorp/cli/libtecla/SConscript	2009-11-27 07:26:17 UTC (rev 11615)
+++ trunk/xorp/cli/libtecla/SConscript	2009-11-27 07:32:31 UTC (rev 11616)
@@ -68,10 +68,10 @@
 
 
 if is_shared:
-    libtecla_xorp = env.SharedLibrary('libtecla_xorp', libtecla_srcs)
+    libxorp_tecla = env.SharedLibrary('libxorp_tecla', libtecla_srcs)
     env.Alias('install',
-              env.InstallLibrary('$libdir', libtecla_xorp))
+              env.InstallLibrary('$libdir', libxorp_tecla))
 else:
-    libtecla_xorp = env.StaticLibrary('libtecla_xorp', libtecla_srcs)
+    libxorp_tecla = env.StaticLibrary('libxorp_tecla', libtecla_srcs)
 
-Default(libtecla_xorp)
+Default(libxorp_tecla)

Modified: trunk/xorp/cli/tests/SConscript
===================================================================
--- trunk/xorp/cli/tests/SConscript	2009-11-27 07:26:17 UTC (rev 11615)
+++ trunk/xorp/cli/tests/SConscript	2009-11-27 07:32:31 UTC (rev 11616)
@@ -41,11 +41,11 @@
 	])
 
 env.AppendUnique(LIBS = [
-	'cli',
+	'xorp_cli',
 	'cliprocessorxif',
 	'clibase',
-	'finder',
-	'tecla_xorp',
+	'xorp_finder',
+	'xorp_tecla',
 	'xorp_ipc',
 	'xorp_proto',
 	'xorp_core',

Modified: trunk/xorp/fea/SConscript
===================================================================
--- trunk/xorp/fea/SConscript	2009-11-27 07:26:17 UTC (rev 11615)
+++ trunk/xorp/fea/SConscript	2009-11-27 07:32:31 UTC (rev 11616)
@@ -88,7 +88,7 @@
     'socket4userxif',
     'socket6userxif',
     'findereventnotifierxif',
-    'cli',
+    'xorp_cli',
     'cliprocessorxif',
     'xorp_fea_client',
     'feaifmgrmirrorxif',   # XXX?
@@ -101,7 +101,7 @@
     'feabase',
     'mfeabase',
     'xorp_mrt',
-    'tecla_xorp',
+    'xorp_tecla',
     'xorp_proto',
     'xorp_ipc',
     'xorp_comm',

Modified: trunk/xorp/fea/tests/SConscript
===================================================================
--- trunk/xorp/fea/tests/SConscript	2009-11-27 07:26:17 UTC (rev 11615)
+++ trunk/xorp/fea/tests/SConscript	2009-11-27 07:32:31 UTC (rev 11616)
@@ -74,7 +74,7 @@
 	'socket4userxif',
 	'socket6userxif',
 	'findereventnotifierxif',
-	'cli',
+	'xorp_cli',
 	'cliprocessorxif',
 	'xorp_fea_client',
 	'feaifmgrmirrorxif',   # XXX?
@@ -87,7 +87,7 @@
 	'feabase',
 	'mfeabase',
 	'xorp_mrt',
-	'tecla_xorp',
+	'xorp_tecla',
 	'xorp_proto',
 	'xorp_ipc',
 	'xorp_comm',

Modified: trunk/xorp/rtrmgr/SConscript
===================================================================
--- trunk/xorp/rtrmgr/SConscript	2009-11-27 07:26:17 UTC (rev 11615)
+++ trunk/xorp/rtrmgr/SConscript	2009-11-27 07:32:31 UTC (rev 11616)
@@ -160,11 +160,11 @@
 
 xorpsh_env.AppendUnique(LIBS = [
     'rtrmgr',
-    'cli',
+    'xorp_cli',
     'clibase',			# XXX Not picked up automagically?
     'cliprocessorxif',		# XXX ditto?
     'xorp_proto',
-    'tecla_xorp',
+    'xorp_tecla',
     'rtrmgrxif',
     'xorpshbase',
     'findereventnotifierxif',


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