From 8682d0293ad0d987e1e7ddc38d6701e5c7f56994 Mon Sep 17 00:00:00 2001 From: "Gustavo J. A. M. Carneiro" Date: Sat, 28 Jul 2007 14:14:16 +0100 Subject: [PATCH] WAF: remove the obj.includes = '.' part from modules, since it causes build failure in OS X, and waf was just fixed to enable header files dependency tracking by default without needing to change obj.includes --- src/applications/wscript | 1 - src/common/wscript | 1 - src/core/wscript | 1 - src/devices/point-to-point/wscript | 1 - src/internet-node/wscript | 1 - src/mobility/wscript | 1 - src/node/wscript | 1 - src/simulator/wscript | 1 - 8 files changed, 8 deletions(-) diff --git a/src/applications/wscript b/src/applications/wscript index 5a9c76f50..0874d58ab 100644 --- a/src/applications/wscript +++ b/src/applications/wscript @@ -8,7 +8,6 @@ def build(bld): obj.source = [ 'onoff-application.cc', ] - obj.includes = '.' headers = bld.create_obj('ns3header') headers.source = [ diff --git a/src/common/wscript b/src/common/wscript index 8f2518d4c..5d58f37b2 100644 --- a/src/common/wscript +++ b/src/common/wscript @@ -24,7 +24,6 @@ def build(bld): 'trace-root.cc', 'data-rate.cc', ] - common.includes = '.' headers = bld.create_obj('ns3header') headers.source = [ diff --git a/src/core/wscript b/src/core/wscript index 011023938..219f5541f 100644 --- a/src/core/wscript +++ b/src/core/wscript @@ -39,7 +39,6 @@ def build(bld): 'component-manager.cc', 'random-variable-default-value.cc', ] - core.includes = '.' if sys.platform == 'win32': core.source.extend([ diff --git a/src/devices/point-to-point/wscript b/src/devices/point-to-point/wscript index 59d6ba3f8..77c26fd80 100644 --- a/src/devices/point-to-point/wscript +++ b/src/devices/point-to-point/wscript @@ -17,5 +17,4 @@ def build(bld): 'point-to-point-channel.h', 'point-to-point-topology.h', ] - module.includes = '.' diff --git a/src/internet-node/wscript b/src/internet-node/wscript index e1c452157..7a1b1c10e 100644 --- a/src/internet-node/wscript +++ b/src/internet-node/wscript @@ -34,7 +34,6 @@ def build(bld): 'pcap-trace.cc', 'udp-impl.cc', ] - obj.includes = '.' headers = bld.create_obj('ns3header') headers.source = [ diff --git a/src/mobility/wscript b/src/mobility/wscript index 99f732fc2..b20c5af67 100644 --- a/src/mobility/wscript +++ b/src/mobility/wscript @@ -20,7 +20,6 @@ def build(bld): 'static-speed-helper.cc', 'static-speed-mobility-model.cc', ] - mobility.includes = '.' headers = bld.create_obj('ns3header') headers.source = [ diff --git a/src/node/wscript b/src/node/wscript index 62974351a..4b1ea1f01 100644 --- a/src/node/wscript +++ b/src/node/wscript @@ -25,7 +25,6 @@ def build(bld): 'ipv4.cc', 'application.cc', ] - node.includes = '.' headers = bld.create_obj('ns3header') headers.source = [ diff --git a/src/simulator/wscript b/src/simulator/wscript index c9f14bd67..9c7925f22 100644 --- a/src/simulator/wscript +++ b/src/simulator/wscript @@ -65,7 +65,6 @@ def build(bld): 'simulator.cc', 'time-default-value.cc', ] - sim.includes = '.' headers = bld.create_obj('ns3header') headers.source = [