interim

examples/wscript

@@ -10,7 +10,9 @@ def build(bld):
         return obj
         
     obj = create_ns_prog('simple-global-routing', 'simple-global-routing.cc',
-                         deps=['p2p', 'internet-node', 'routing'])
-    obj = create_ns_prog('simple-point-to-point', 'simple-point-to-point.cc', deps=['point-to-point', 'internet-node'])
-    obj = create_ns_prog('csma-cd-one-subnet', 'csma-cd-one-subnet.cc', deps=['csma-cd', 'internet-node'])
+                         deps=['point-to-point', 'internet-node', 'global-routing'])
+    obj = create_ns_prog('simple-point-to-point', 'simple-point-to-point.cc', 
+                         deps=['point-to-point', 'internet-node'])
+    obj = create_ns_prog('csma-cd-one-subnet', 'csma-cd-one-subnet.cc', 
+                         deps=['csma-cd', 'internet-node'])
 

src/internet-node/wscript

@@ -5,7 +5,7 @@ def build(bld):
     obj = bld.create_obj('cpp', 'shlib')
     obj.name = 'ns3-internet-node'
     obj.target = obj.name
-    obj.uselib_local = ['ns3-node', 'ns3-applications', 'ns3-routing']
+    obj.uselib_local = ['ns3-node', 'ns3-applications']
     obj.source = [
         'internet-node.cc',
         'l3-demux.cc',

src/routing/global/wscript

@@ -1,12 +1,8 @@
 ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
 
-def configure(conf):
-    conf.env.append_value('NS3_MODULES', 'ns3-routing')
-
-
 def build(bld):
     module = bld.create_obj('cpp', 'shlib')
-    module.name = 'ns3-routing'
+    module.name = 'ns3-global-routing'
     module.target = module.name
     module.uselib_local = ['ns3-node']
     module.source = [
@@ -15,10 +11,10 @@ def build(bld):
         'global-route-manager-impl.cc',
         'candidate-queue.cc',
         ]
-
     headers = bld.create_obj('ns3header')
     headers.source = [
         'global-router-interface.h',
         'global-route-manager.h',
         'candidate-queue.h',
         ]
+

src/wscript

@@ -18,7 +18,7 @@ all_modules = (
     'devices/point-to-point',
     'devices/csma-cd',
     'applications',
-    'routing/global',
+    'routing/global-routing',
     'mobility',
     )