[Xorp-cvs] SF.net SVN: xorp:[11606] trunk/xorp/ospf/SConscript

[bms_fbsd at users.sourceforge.net]

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

Log Message:
-----------
libospf => libxorp_ospf

Modified Paths:
--------------
    trunk/xorp/ospf/SConscript

Modified: trunk/xorp/ospf/SConscript
===================================================================
--- trunk/xorp/ospf/SConscript	2009-11-27 06:24:22 UTC (rev 11605)
+++ trunk/xorp/ospf/SConscript	2009-11-27 06:26:37 UTC (rev 11606)
@@ -50,7 +50,7 @@
     ])
 
 env.AppendUnique(LIBS = [
-    'ospf',
+    'xorp_ospf',		# Refers to the library, not the executable.
     'ospfv2base',
     'ospfv3base',
     'policybackend',
@@ -70,7 +70,7 @@
     'xorp_comm',
 ])
 
-libospfsrcs = [
+libxorp_ospf_srcs = [
 	     'auth.cc',
 	     'area_router.cc',
 	     'external.cc',
@@ -88,9 +88,13 @@
              ]
 
 if is_shared:
-    libospf = env.SharedLibrary(target = 'libospf', source = libospfsrcs, LIBS = '')
+    libxorp_ospf = env.SharedLibrary(target = 'libxorp_ospf',
+				     source = libxorp_ospf_srcs,
+				     LIBS = '')
 else:
-    libospf = env.StaticLibrary(target = 'libospf', source = libospfsrcs, LIBS = '')
+    libxorp_ospf = env.StaticLibrary(target = 'libxorp_ospf',
+				     source = libxorp_ospf_srcs,
+				     LIBS = '')
 
 ospfv2srcs = [
           'xorp_ospfv2.cc',
@@ -115,6 +119,6 @@
 
 if is_shared:
     env.Alias('install',
-              env.InstallLibrary('$libdir', libospf))
+              env.InstallLibrary('$libdir', libxorp_ospf))
 
 Default(ospfv2, ospfv3)


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