Mercurial Mercurial > tomh > ns-3-dev-spectrum-wifi / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix some additional dependency issues
authorTom Henderson <tomh@tomh.org>
Fri, 25 Feb 2011 12:11:11 -0800
changeset 6836 638bb8c62285
parent 6835 f99f5c9f0cc7
child 6837 7333e147e014
Fix some additional dependency issues
examples/wireless/wscript file | annotate | diff | comparison | revisions
samples/wscript file | annotate | diff | comparison | revisions
src/applications/bulk-send/wscript file | annotate | diff | comparison | revisions
src/applications/onoff/wscript file | annotate | diff | comparison | revisions
src/applications/packet-sink/wscript file | annotate | diff | comparison | revisions
src/devices/tap-bridge/wscript file | annotate | diff | comparison | revisions
src/devices/wifi/wscript file | annotate | diff | comparison | revisions
src/devices/wimax/wscript file | annotate | diff | comparison | revisions 
--- a/examples/wireless/wscript	Fri Feb 25 10:53:55 2011 -0800
+++ b/examples/wireless/wscript	Fri Feb 25 12:11:11 2011 -0800
@@ -5,10 +5,10 @@
                                                     'internet'])
     obj.source = 'mixed-wireless.cc'
 
-    obj = bld.create_ns3_program('wifi-adhoc', ['core', 'mobility', 'wifi'])
+    obj = bld.create_ns3_program('wifi-adhoc', ['core', 'mobility', 'wifi', 'contrib'])
     obj.source = 'wifi-adhoc.cc'
 
-    obj = bld.create_ns3_program('wifi-clear-channel-cmu', ['core', 'mobility', 'wifi'])
+    obj = bld.create_ns3_program('wifi-clear-channel-cmu', ['core', 'mobility', 'wifi', 'contrib'])
     obj.source = 'wifi-clear-channel-cmu.cc'
 
     obj = bld.create_ns3_program('wifi-ap', ['core', 'mobility', 'wifi'])
@@ -20,7 +20,7 @@
     obj = bld.create_ns3_program('simple-wifi-frame-aggregation', ['core', 'mobility', 'wifi'])
     obj.source = 'simple-wifi-frame-aggregation.cc'
 
-    obj = bld.create_ns3_program('multirate', ['core', 'mobility', 'wifi'])
+    obj = bld.create_ns3_program('multirate', ['core', 'mobility', 'wifi', 'contrib'])
     obj.source = 'multirate.cc'
 
     obj = bld.create_ns3_program('wifi-simple-adhoc', ['core', 'mobility', 'wifi'])
@@ -38,7 +38,7 @@
     obj = bld.create_ns3_program('wifi-blockack', ['core', 'mobility', 'wifi'])
     obj.source = 'wifi-blockack.cc'
 
-    obj = bld.create_ns3_program('ofdm-validation', ['core', 'mobility', 'wifi'])
+    obj = bld.create_ns3_program('ofdm-validation', ['core', 'mobility', 'wifi', 'contrib'])
     obj.source = 'ofdm-validation.cc'
 
     obj = bld.create_ns3_program('wifi-hidden-terminal', ['core', 'mobility', 'wifi', 'propagation', 'flow-monitor'])
--- a/samples/wscript	Fri Feb 25 10:53:55 2011 -0800
+++ b/samples/wscript	Fri Feb 25 12:11:11 2011 -0800
@@ -47,7 +47,7 @@
     obj.source = 'main-random-walk.cc'
 
     obj = bld.create_ns3_program('main-propagation-loss',
-                                 ['core', 'mobility', 'wifi'])
+                                 ['core', 'mobility', 'contrib'])
     obj.source = 'main-propagation-loss.cc'
 
     obj = bld.create_ns3_program('sample-random-variable',
--- a/src/applications/bulk-send/wscript	Fri Feb 25 10:53:55 2011 -0800
+++ b/src/applications/bulk-send/wscript	Fri Feb 25 12:11:11 2011 -0800
@@ -1,7 +1,7 @@
 ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
 
 def build(bld):
-    module = bld.create_ns3_module('bulk-send', ['core', 'network'])
+    module = bld.create_ns3_module('bulk-send', ['core', 'internet'])
     module.source = [
         'bulk-send-application.cc',
         ]
--- a/src/applications/onoff/wscript	Fri Feb 25 10:53:55 2011 -0800
+++ b/src/applications/onoff/wscript	Fri Feb 25 12:11:11 2011 -0800
@@ -1,7 +1,7 @@
 ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
 
 def build(bld):
-    module = bld.create_ns3_module('onoff', ['core', 'network'])
+    module = bld.create_ns3_module('onoff', ['core', 'network', 'internet'])
     module.source = [
         'onoff-application.cc',
         ]
--- a/src/applications/packet-sink/wscript	Fri Feb 25 10:53:55 2011 -0800
+++ b/src/applications/packet-sink/wscript	Fri Feb 25 12:11:11 2011 -0800
@@ -1,7 +1,7 @@
 ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
 
 def build(bld):
-    module = bld.create_ns3_module('packet-sink', ['network'])
+    module = bld.create_ns3_module('packet-sink', ['internet'])
     module.source = [
         'packet-sink.cc',
         ]
--- a/src/devices/tap-bridge/wscript	Fri Feb 25 10:53:55 2011 -0800
+++ b/src/devices/tap-bridge/wscript	Fri Feb 25 12:11:11 2011 -0800
@@ -20,7 +20,7 @@
         conf.env.append_value('NS3_EXECUTABLE_PATH', tapcreatordir)
 
 def build(bld):
-    module = bld.create_ns3_module('tap-bridge', ['network'])
+    module = bld.create_ns3_module('tap-bridge', ['network', 'internet'])
     module.source = [
         ]
     headers = bld.new_task_gen('ns3header')
--- a/src/devices/wifi/wscript	Fri Feb 25 10:53:55 2011 -0800
+++ b/src/devices/wifi/wscript	Fri Feb 25 12:11:11 2011 -0800
@@ -1,7 +1,7 @@
 ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
 
 def build(bld):
-    obj = bld.create_ns3_module('wifi', ['network'])
+    obj = bld.create_ns3_module('wifi', ['network', 'propagation'])
     obj.source = [
         'wifi-information-element.cc',
         'wifi-information-element-vector.cc',
--- a/src/devices/wimax/wscript	Fri Feb 25 10:53:55 2011 -0800
+++ b/src/devices/wimax/wscript	Fri Feb 25 12:11:11 2011 -0800
@@ -1,6 +1,6 @@
 ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
 def build(bld):
-    obj = bld.create_ns3_module('wimax', ['network'])
+    obj = bld.create_ns3_module('wimax', ['network', 'spectrum'])
     obj.source = [
             'cid.cc',
             'cid-factory.cc',
tomh/ns-3-dev-spectrum-wifi