[Xorp-cvs] SF.net SVN: xorp:[11568] trunk/xorp
johntconklin at users.sourceforge.net
johntconklin at users.sourceforge.net
Thu Oct 8 20:05:01 PDT 2009
Revision: 11568
http://xorp.svn.sourceforge.net/xorp/?rev=11568&view=rev
Author: johntconklin
Date: 2009-10-09 03:05:01 +0000 (Fri, 09 Oct 2009)
Log Message:
-----------
Changed LIBPATH lists to use absolute (rooted by $BUILDDIR) rather
than relative paths.
Modified Paths:
--------------
trunk/xorp/bgp/harness/SConscript
trunk/xorp/cli/tools/SConscript
trunk/xorp/fea/tools/SConscript
trunk/xorp/fib2mrib/SConscript
trunk/xorp/mld6igmp/SConscript
trunk/xorp/ospf/SConscript
trunk/xorp/ospf/tools/SConscript
trunk/xorp/pim/SConscript
trunk/xorp/rib/SConscript
trunk/xorp/rib/tools/SConscript
trunk/xorp/rip/SConscript
trunk/xorp/rip/tools/SConscript
trunk/xorp/static_routes/SConscript
trunk/xorp/vrrp/SConscript
Modified: trunk/xorp/bgp/harness/SConscript
===================================================================
--- trunk/xorp/bgp/harness/SConscript 2009-10-03 10:41:28 UTC (rev 11567)
+++ trunk/xorp/bgp/harness/SConscript 2009-10-09 03:05:01 UTC (rev 11568)
@@ -28,11 +28,11 @@
])
env.AppendUnique(LIBPATH = [
- '../../libxorp',
- '../../libcomm',
- '../../libxipc',
- '../../xrl/interfaces',
- '../../xrl/targets',
+ '$BUILDDIR/libxorp',
+ '$BUILDDIR/libcomm',
+ '$BUILDDIR/libxipc',
+ '$BUILDDIR/xrl/interfaces',
+ '$BUILDDIR/xrl/targets',
'.',
])
Modified: trunk/xorp/cli/tools/SConscript
===================================================================
--- trunk/xorp/cli/tools/SConscript 2009-10-03 10:41:28 UTC (rev 11567)
+++ trunk/xorp/cli/tools/SConscript 2009-10-09 03:05:01 UTC (rev 11568)
@@ -28,12 +28,12 @@
])
env.AppendUnique(LIBPATH = [
- '../../libxorp',
- '../../libcomm',
- '../../libxipc',
- '../../libproto',
- '../../xrl/interfaces',
- '../../xrl/targets',
+ '$BUILDDIR/libxorp',
+ '$BUILDDIR/libcomm',
+ '$BUILDDIR/libxipc',
+ '$BUILDDIR/libproto',
+ '$BUILDDIR/xrl/interfaces',
+ '$BUILDDIR/xrl/targets',
'.',
])
Modified: trunk/xorp/fea/tools/SConscript
===================================================================
--- trunk/xorp/fea/tools/SConscript 2009-10-03 10:41:28 UTC (rev 11567)
+++ trunk/xorp/fea/tools/SConscript 2009-10-09 03:05:01 UTC (rev 11568)
@@ -28,13 +28,13 @@
])
env.AppendUnique(LIBPATH = [
- '../../libxorp',
- '../../libcomm',
- '../../libxipc',
- '../../libproto',
- '../../libfeaclient',
- '../../xrl/interfaces',
- '../../xrl/targets',
+ '$BUILDDIR/libxorp',
+ '$BUILDDIR/libcomm',
+ '$BUILDDIR/libxipc',
+ '$BUILDDIR/libproto',
+ '$BUILDDIR/libfeaclient',
+ '$BUILDDIR/xrl/interfaces',
+ '$BUILDDIR/xrl/targets',
'.',
])
Modified: trunk/xorp/fib2mrib/SConscript
===================================================================
--- trunk/xorp/fib2mrib/SConscript 2009-10-03 10:41:28 UTC (rev 11567)
+++ trunk/xorp/fib2mrib/SConscript 2009-10-09 03:05:01 UTC (rev 11568)
@@ -30,15 +30,15 @@
])
env.PrependUnique(LIBPATH = [
- '../libxorp',
- '../libcomm',
- '../libxipc',
- '../libproto',
- '../libfeaclient',
- '../policy/backend',
- '../policy/common',
- '../xrl/interfaces',
- '../xrl/targets',
+ '$BUILDDIR/libxorp',
+ '$BUILDDIR/libcomm',
+ '$BUILDDIR/libxipc',
+ '$BUILDDIR/libproto',
+ '$BUILDDIR/libfeaclient',
+ '$BUILDDIR/policy/backend',
+ '$BUILDDIR/policy/common',
+ '$BUILDDIR/xrl/interfaces',
+ '$BUILDDIR/xrl/targets',
'.'
])
Modified: trunk/xorp/mld6igmp/SConscript
===================================================================
--- trunk/xorp/mld6igmp/SConscript 2009-10-03 10:41:28 UTC (rev 11567)
+++ trunk/xorp/mld6igmp/SConscript 2009-10-09 03:05:01 UTC (rev 11568)
@@ -29,16 +29,16 @@
])
env.PrependUnique(LIBPATH = [
- '../libxorp',
- '../libcomm',
- '../libxipc',
- '../libproto',
- '../libfeaclient',
- '../policy/backend',
- '../policy/common',
- '../xrl/interfaces',
- '../xrl/targets',
- '../mrt',
+ '$BUILDDIR/libxorp',
+ '$BUILDDIR/libcomm',
+ '$BUILDDIR/libxipc',
+ '$BUILDDIR/libproto',
+ '$BUILDDIR/libfeaclient',
+ '$BUILDDIR/policy/backend',
+ '$BUILDDIR/policy/common',
+ '$BUILDDIR/xrl/interfaces',
+ '$BUILDDIR/xrl/targets',
+ '$BUILDDIR/mrt',
'.'
])
Modified: trunk/xorp/ospf/SConscript
===================================================================
--- trunk/xorp/ospf/SConscript 2009-10-03 10:41:28 UTC (rev 11567)
+++ trunk/xorp/ospf/SConscript 2009-10-09 03:05:01 UTC (rev 11568)
@@ -36,16 +36,16 @@
])
env.PrependUnique(LIBPATH = [
- '../libxorp',
- '../libcomm',
- '../libxipc',
- '../libproto',
- '../libfeaclient',
- '../policy/backend',
- '../policy/common',
- '../xrl/interfaces',
- '../xrl/targets',
- '../mrt',
+ '$BUILDDIR/libxorp',
+ '$BUILDDIR/libcomm',
+ '$BUILDDIR/libxipc',
+ '$BUILDDIR/libproto',
+ '$BUILDDIR/libfeaclient',
+ '$BUILDDIR/policy/backend',
+ '$BUILDDIR/policy/common',
+ '$BUILDDIR/xrl/interfaces',
+ '$BUILDDIR/xrl/targets',
+ '$BUILDDIR/mrt',
'.'
])
Modified: trunk/xorp/ospf/tools/SConscript
===================================================================
--- trunk/xorp/ospf/tools/SConscript 2009-10-03 10:41:28 UTC (rev 11567)
+++ trunk/xorp/ospf/tools/SConscript 2009-10-09 03:05:01 UTC (rev 11568)
@@ -30,12 +30,12 @@
])
env.AppendUnique(LIBPATH = [
- '../../libxorp',
- '../../libcomm',
- '../../libxipc',
- '../../libproto',
- '../../xrl/interfaces',
- '../../xrl/targets',
+ '$BUILDDIR/libxorp',
+ '$BUILDDIR/libcomm',
+ '$BUILDDIR/libxipc',
+ '$BUILDDIR/libproto',
+ '$BUILDDIR/xrl/interfaces',
+ '$BUILDDIR/xrl/targets',
'.',
])
Modified: trunk/xorp/pim/SConscript
===================================================================
--- trunk/xorp/pim/SConscript 2009-10-03 10:41:28 UTC (rev 11567)
+++ trunk/xorp/pim/SConscript 2009-10-09 03:05:01 UTC (rev 11568)
@@ -30,16 +30,16 @@
])
env.PrependUnique(LIBPATH = [
- '../libxorp',
- '../libcomm',
- '../libxipc',
- '../libproto',
- '../libfeaclient',
- '../policy/backend',
- '../policy/common',
- '../xrl/interfaces',
- '../xrl/targets',
- '../mrt',
+ '$BUILDDIR/libxorp',
+ '$BUILDDIR/libcomm',
+ '$BUILDDIR/libxipc',
+ '$BUILDDIR/libproto',
+ '$BUILDDIR/libfeaclient',
+ '$BUILDDIR/policy/backend',
+ '$BUILDDIR/policy/common',
+ '$BUILDDIR/xrl/interfaces',
+ '$BUILDDIR/xrl/targets',
+ '$BUILDDIR/mrt',
'.'
])
Modified: trunk/xorp/rib/SConscript
===================================================================
--- trunk/xorp/rib/SConscript 2009-10-03 10:41:28 UTC (rev 11567)
+++ trunk/xorp/rib/SConscript 2009-10-09 03:05:01 UTC (rev 11568)
@@ -37,15 +37,15 @@
])
env.PrependUnique(LIBPATH = [
- '../libxorp',
- '../libcomm',
- '../libxipc',
- '../libproto',
- '../libfeaclient',
- '../policy/backend',
- '../policy/common',
- '../xrl/interfaces',
- '../xrl/targets',
+ '$BUILDDIR/libxorp',
+ '$BUILDDIR/libcomm',
+ '$BUILDDIR/libxipc',
+ '$BUILDDIR/libproto',
+ '$BUILDDIR/libfeaclient',
+ '$BUILDDIR/policy/backend',
+ '$BUILDDIR/policy/common',
+ '$BUILDDIR/xrl/interfaces',
+ '$BUILDDIR/xrl/targets',
'.'
])
Modified: trunk/xorp/rib/tools/SConscript
===================================================================
--- trunk/xorp/rib/tools/SConscript 2009-10-03 10:41:28 UTC (rev 11567)
+++ trunk/xorp/rib/tools/SConscript 2009-10-09 03:05:01 UTC (rev 11568)
@@ -28,12 +28,12 @@
])
env.AppendUnique(LIBPATH = [
- '../../libxorp',
- '../../libcomm',
- '../../libxipc',
- '../../libproto',
- '../../xrl/interfaces',
- '../../xrl/targets',
+ '$BUILDDIR/libxorp',
+ '$BUILDDIR/libcomm',
+ '$BUILDDIR/libxipc',
+ '$BUILDDIR/libproto',
+ '$BUILDDIR/xrl/interfaces',
+ '$BUILDDIR/xrl/targets',
'.',
])
Modified: trunk/xorp/rip/SConscript
===================================================================
--- trunk/xorp/rip/SConscript 2009-10-03 10:41:28 UTC (rev 11567)
+++ trunk/xorp/rip/SConscript 2009-10-09 03:05:01 UTC (rev 11568)
@@ -96,16 +96,16 @@
])
e.PrependUnique(LIBPATH = [
- '../policy/backend',
- '../policy/common',
- '../xrl/interfaces',
- '../xrl/targets',
'.',
+ '$BUILDDIR/policy/backend',
+ '$BUILDDIR/policy/common',
+ '$BUILDDIR/xrl/interfaces',
+ '$BUILDDIR/xrl/targets',
'$BUILDDIR/libfeaclient',
- '../libproto',
- '../libxipc',
- '../libxorp',
- '../libcomm',
+ '$BUILDDIR/libproto',
+ '$BUILDDIR/libxipc',
+ '$BUILDDIR/libcomm',
+ '$BUILDDIR/libxorp',
])
e.PrependUnique(LIBS = [
@@ -123,8 +123,8 @@
'policycommon',
'proto',
'xipc',
+ 'comm',
'xorp',
- 'comm',
])
if is_shared:
@@ -159,15 +159,15 @@
e.PrependUnique(LIBPATH = [
'.',
- '../libfeaclient',
- '../policy/backend',
- '../policy/common',
- '../xrl/interfaces',
- '../xrl/targets',
- '../libproto',
- '../libxipc',
- '../libxorp',
- '../libcomm',
+ '$BUILDDIR/libfeaclient',
+ '$BUILDDIR/policy/backend',
+ '$BUILDDIR/policy/common',
+ '$BUILDDIR/xrl/interfaces',
+ '$BUILDDIR/xrl/targets',
+ '$BUILDDIR/libproto',
+ '$BUILDDIR/libxipc',
+ '$BUILDDIR/libcomm',
+ '$BUILDDIR/libxorp',
])
e.PrependUnique(LIBS = [
@@ -185,8 +185,8 @@
'policycommon',
'proto',
'xipc',
+ 'comm',
'xorp',
- 'comm',
])
if is_shared:
Modified: trunk/xorp/rip/tools/SConscript
===================================================================
--- trunk/xorp/rip/tools/SConscript 2009-10-03 10:41:28 UTC (rev 11567)
+++ trunk/xorp/rip/tools/SConscript 2009-10-09 03:05:01 UTC (rev 11568)
@@ -28,12 +28,12 @@
])
env.AppendUnique(LIBPATH = [
- '../../libxorp',
- '../../libcomm',
- '../../libxipc',
- '../../libproto',
- '../../xrl/interfaces',
- '../../xrl/targets',
+ '$BUILDDIR/libxorp',
+ '$BUILDDIR/libcomm',
+ '$BUILDDIR/libxipc',
+ '$BUILDDIR/libproto',
+ '$BUILDDIR/xrl/interfaces',
+ '$BUILDDIR/xrl/targets',
'.',
])
Modified: trunk/xorp/static_routes/SConscript
===================================================================
--- trunk/xorp/static_routes/SConscript 2009-10-03 10:41:28 UTC (rev 11567)
+++ trunk/xorp/static_routes/SConscript 2009-10-09 03:05:01 UTC (rev 11568)
@@ -30,15 +30,15 @@
])
env.PrependUnique(LIBPATH = [
- '../libxorp',
- '../libcomm',
- '../libxipc',
- '../libproto',
- '../libfeaclient',
- '../policy/backend',
- '../policy/common',
- '../xrl/interfaces',
- '../xrl/targets',
+ '$BUILDDIR/libxorp',
+ '$BUILDDIR/libcomm',
+ '$BUILDDIR/libxipc',
+ '$BUILDDIR/libproto',
+ '$BUILDDIR/libfeaclient',
+ '$BUILDDIR/policy/backend',
+ '$BUILDDIR/policy/common',
+ '$BUILDDIR/xrl/interfaces',
+ '$BUILDDIR/xrl/targets',
'.'
])
Modified: trunk/xorp/vrrp/SConscript
===================================================================
--- trunk/xorp/vrrp/SConscript 2009-10-03 10:41:28 UTC (rev 11567)
+++ trunk/xorp/vrrp/SConscript 2009-10-09 03:05:01 UTC (rev 11568)
@@ -35,13 +35,13 @@
])
env.PrependUnique(LIBPATH = [
- '../libxorp',
- '../libcomm',
- '../libxipc',
- '../libproto',
- '../libfeaclient',
- '../xrl/interfaces',
- '../xrl/targets',
+ '$BUILDDIR/libxorp',
+ '$BUILDDIR/libcomm',
+ '$BUILDDIR/libxipc',
+ '$BUILDDIR/libproto',
+ '$BUILDDIR/libfeaclient',
+ '$BUILDDIR/xrl/interfaces',
+ '$BUILDDIR/xrl/targets',
'.'
])
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