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

[bms_fbsd at users.sourceforge.net]

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

Log Message:
-----------
Catch stragglers in LIBS.

Modified Paths:
--------------
    trunk/xorp/libproto/SConscript
    trunk/xorp/xrl/interfaces/SConscript
    trunk/xorp/xrl/targets/SConscript

Modified: trunk/xorp/libproto/SConscript
===================================================================
--- trunk/xorp/libproto/SConscript	2009-11-27 07:11:37 UTC (rev 11612)
+++ trunk/xorp/libproto/SConscript	2009-11-27 07:12:59 UTC (rev 11613)
@@ -28,7 +28,8 @@
 
 env.AppendUnique(CPPPATH = [ "#" ])
 env.PrependUnique(LIBPATH = [ '$BUILDDIR/libxorp'] )
-env.AppendUnique(LIBS = ['libxorp', 'crypto'])
+# XXX 'crypto' is a base system prerequisite; use LINKFLAGS?
+env.AppendUnique(LIBS = ['xorp_core', 'crypto'])
 
 sources = [
 	'checksum.c',

Modified: trunk/xorp/xrl/interfaces/SConscript
===================================================================
--- trunk/xorp/xrl/interfaces/SConscript	2009-11-27 07:11:37 UTC (rev 11612)
+++ trunk/xorp/xrl/interfaces/SConscript	2009-11-27 07:12:59 UTC (rev 11613)
@@ -30,9 +30,9 @@
 env.AppendUnique(LIBPATH = [ '$BUILDDIR/libxipc',
 			     '$BUILDDIR/libcomm',
                              '$BUILDDIR/libxorp' ] )
-env.AppendUnique(LIBS = [ 'libxipc',
-			  'libcomm',
-                          'libxorp' ])
+env.AppendUnique(LIBS = [ 'xorp_ipc',
+			  'xorp_comm',
+                          'xorp_core' ])
 
 xifs = [
     'bgp.xif',

Modified: trunk/xorp/xrl/targets/SConscript
===================================================================
--- trunk/xorp/xrl/targets/SConscript	2009-11-27 07:11:37 UTC (rev 11612)
+++ trunk/xorp/xrl/targets/SConscript	2009-11-27 07:12:59 UTC (rev 11613)
@@ -32,9 +32,9 @@
 	])
 
 env.AppendUnique(LIBS = [
-	'libxipc',
-	'libcomm',
-	'libxorp',
+	'xorp_ipc',
+	'xorp_comm',
+	'xorp_core',
 	])
 
 env['TGTGEN_CPPPATH'] = [ '#/xrl/interfaces' ]


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