diff --git a/src/applications/onoff/wscript b/src/applications/onoff/wscript index 6afd3b262..ee1041066 100644 --- a/src/applications/onoff/wscript +++ b/src/applications/onoff/wscript @@ -6,6 +6,7 @@ def build(bld): 'onoff-application.cc', ] headers = bld.create_obj('ns3header') + headers.module = 'onoff' headers.source = [ 'onoff-application.h', ] diff --git a/src/applications/packet-sink/wscript b/src/applications/packet-sink/wscript index 332b6e4a1..120095544 100644 --- a/src/applications/packet-sink/wscript +++ b/src/applications/packet-sink/wscript @@ -6,6 +6,7 @@ def build(bld): 'packet-sink.cc', ] headers = bld.create_obj('ns3header') + headers.module = 'packet-sink' headers.source = [ 'packet-sink.h', ] diff --git a/src/applications/udp-echo/wscript b/src/applications/udp-echo/wscript index f6416980a..fa25a5c53 100644 --- a/src/applications/udp-echo/wscript +++ b/src/applications/udp-echo/wscript @@ -7,6 +7,7 @@ def build(bld): 'udp-echo-server.cc', ] headers = bld.create_obj('ns3header') + headers.module = 'udp-echo' headers.source = [ 'udp-echo-client.h', 'udp-echo-server.h', diff --git a/src/common/wscript b/src/common/wscript index 30589542a..b25aff575 100644 --- a/src/common/wscript +++ b/src/common/wscript @@ -17,6 +17,7 @@ def build(bld): ] headers = bld.create_obj('ns3header') + headers.module = 'common' headers.source = [ 'buffer.h', 'chunk-registry.h', diff --git a/src/contrib/wscript b/src/contrib/wscript index bbcc87009..223077d38 100644 --- a/src/contrib/wscript +++ b/src/contrib/wscript @@ -9,6 +9,7 @@ def build(bld): ] headers = bld.create_obj('ns3header') + headers.module = 'contrib' headers.source = [ 'event-garbage-collector.h', 'gnuplot.h', diff --git a/src/core/wscript b/src/core/wscript index 08ac11687..5d1dd97e9 100644 --- a/src/core/wscript +++ b/src/core/wscript @@ -67,6 +67,7 @@ def build(bld): ]) headers = bld.create_obj('ns3header') + headers.module = 'core' headers.source = [ 'system-wall-clock-ms.h', 'empty.h', diff --git a/src/devices/csma/wscript b/src/devices/csma/wscript index 8257c06dc..60d8e6a8f 100644 --- a/src/devices/csma/wscript +++ b/src/devices/csma/wscript @@ -10,6 +10,7 @@ def build(bld): 'csma-ipv4-topology.cc', ] headers = bld.create_obj('ns3header') + headers.module = 'csma' headers.source = [ 'backoff.h', 'csma-net-device.h', diff --git a/src/devices/point-to-point/wscript b/src/devices/point-to-point/wscript index c788a7880..c8b110425 100644 --- a/src/devices/point-to-point/wscript +++ b/src/devices/point-to-point/wscript @@ -9,6 +9,7 @@ def build(bld): 'point-to-point-topology.cc', ] headers = bld.create_obj('ns3header') + headers.module = 'point-to-point' headers.source = [ 'point-to-point-net-device.h', 'point-to-point-channel.h', diff --git a/src/devices/wifi/wscript b/src/devices/wifi/wscript index 182260407..b9a715fff 100644 --- a/src/devices/wifi/wscript +++ b/src/devices/wifi/wscript @@ -38,6 +38,7 @@ def build(bld): 'constant-rate-wifi-manager.cc', ] headers = bld.create_obj('ns3header') + headers.module = 'wifi' headers.source = [ 'propagation-delay-model.h', 'propagation-loss-model.h', diff --git a/src/internet-node/wscript b/src/internet-node/wscript index 73131140f..15b0336a8 100644 --- a/src/internet-node/wscript +++ b/src/internet-node/wscript @@ -36,6 +36,7 @@ def build(bld): ] headers = bld.create_obj('ns3header') + headers.module = 'internet-node' headers.source = [ 'internet-node.h', 'ascii-trace.h', diff --git a/src/mobility/wscript b/src/mobility/wscript index b66f8777c..d4c0f6cf5 100644 --- a/src/mobility/wscript +++ b/src/mobility/wscript @@ -19,6 +19,7 @@ def build(bld): ] headers = bld.create_obj('ns3header') + headers.module = 'mobility' headers.source = [ 'vector.h', 'hierarchical-mobility-model.h', diff --git a/src/node/wscript b/src/node/wscript index 893659fb9..fa4761db2 100644 --- a/src/node/wscript +++ b/src/node/wscript @@ -31,6 +31,7 @@ def build(bld): ] headers = bld.create_obj('ns3header') + headers.module = 'node' headers.source = [ 'address.h', 'mac48-address.h', diff --git a/src/routing/global-routing/wscript b/src/routing/global-routing/wscript index b14a5c502..b2758cc54 100644 --- a/src/routing/global-routing/wscript +++ b/src/routing/global-routing/wscript @@ -9,6 +9,7 @@ def build(bld): 'candidate-queue.cc', ] headers = bld.create_obj('ns3header') + headers.module = 'global-routing' headers.source = [ 'global-router-interface.h', 'global-route-manager.h', diff --git a/src/routing/olsr/wscript b/src/routing/olsr/wscript index 735801952..8a3082c7d 100644 --- a/src/routing/olsr/wscript +++ b/src/routing/olsr/wscript @@ -12,6 +12,7 @@ def build(bld): ] headers = bld.create_obj('ns3header') + headers.module = 'olsr' headers.source = [ 'olsr-agent.h', 'olsr-header.h', diff --git a/src/simulator/wscript b/src/simulator/wscript index 0d8aa1677..5d6963394 100644 --- a/src/simulator/wscript +++ b/src/simulator/wscript @@ -63,6 +63,7 @@ def build(bld): ] headers = bld.create_obj('ns3header') + headers.module = 'simulator' headers.source = [ 'high-precision.h', 'nstime.h', diff --git a/src/wscript b/src/wscript index 0b41d7d6c..aac4a5646 100644 --- a/src/wscript +++ b/src/wscript @@ -81,11 +81,14 @@ class Ns3Header(Object.genobj): self.inst_var = 'INCLUDEDIR' self.inst_dir = 'ns3' self.sub_dir = None # if not None, header files will be published as ns3/sub_dir/file.h + self.module = None # module name self.env = env if not self.env: self.env = Params.g_build.m_allenvs['default'] def apply(self): + if self.module is None: + Params.fatal("'module' missing on ns3headers object %s" % self) ns3_dir_node = Params.g_build.m_srcnode.find_dir("ns3") if self.sub_dir is not None: ns3_dir_node = ns3_dir_node.find_dir(self.sub_dir)