# HG changeset patch
# User Tommaso Pecorella <tommaso.pecorella@unifi.it>
# Date 1436354849 -7200
# Parent  0ed01e6d78c50fb1e76cbd7129561260eb65f3e0
Bug 1941 - Remove redundant dependency internet / network / core

diff --git a/src/brite/wscript b/src/brite/wscript
--- a/src/brite/wscript
+++ b/src/brite/wscript
@@ -84,7 +84,7 @@
     if 'brite' in bld.env['MODULES_NOT_BUILT']:
         return
 
-    module = bld.create_ns3_module('brite', ['network', 'core', 'internet', 'point-to-point'])
+    module = bld.create_ns3_module('brite', ['internet', 'point-to-point'])
     module.source = [
         ]
 
diff --git a/src/click/wscript b/src/click/wscript
--- a/src/click/wscript
+++ b/src/click/wscript
@@ -101,7 +101,7 @@
     if 'click' in bld.env['MODULES_NOT_BUILT']:
         return
 
-    module = bld.create_ns3_module('click', ['core', 'network', 'internet'])
+    module = bld.create_ns3_module('click', ['internet'])
     module.source = [
         'model/ipv4-click-routing.cc',
         'model/ipv4-l3-click-protocol.cc',
diff --git a/src/config-store/wscript b/src/config-store/wscript
--- a/src/config-store/wscript
+++ b/src/config-store/wscript
@@ -40,7 +40,7 @@
 def build(bld):
     bld.install_files('${INCLUDEDIR}/%s%s/ns3' % (wutils.APPNAME, wutils.VERSION), '../../ns3/config-store-config.h')
 
-    module = bld.create_ns3_module('config-store', ['core', 'network'])
+    module = bld.create_ns3_module('config-store', ['network'])
     module.source = [
         'model/attribute-iterator.cc',
         'model/config-store.cc',
diff --git a/src/csma-layout/wscript b/src/csma-layout/wscript
--- a/src/csma-layout/wscript
+++ b/src/csma-layout/wscript
@@ -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('csma-layout', ['csma', 'network', 'internet'])
+    obj = bld.create_ns3_module('csma-layout', ['csma', 'internet'])
     obj.source = [
         'model/csma-star-helper.cc',
         ]
diff --git a/src/internet/wscript b/src/internet/wscript
--- a/src/internet/wscript
+++ b/src/internet/wscript
@@ -104,7 +104,7 @@
 
 def build(bld):
     # bridge and mpi dependencies are due to global routing
-    obj = bld.create_ns3_module('internet', ['bridge', 'mpi', 'network', 'core'])
+    obj = bld.create_ns3_module('internet', ['bridge', 'mpi', 'network'])
     obj.source = [
         'model/ip-l4-protocol.cc',
         'model/udp-header.cc',
diff --git a/src/lr-wpan/wscript b/src/lr-wpan/wscript
--- a/src/lr-wpan/wscript
+++ b/src/lr-wpan/wscript
@@ -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('lr-wpan', ['core', 'network', 'mobility', 'spectrum', 'propagation'])
+    obj = bld.create_ns3_module('lr-wpan', ['network', 'mobility', 'spectrum', 'propagation'])
     obj.source = [
         'model/lr-wpan-error-model.cc',
         'model/lr-wpan-interference-helper.cc',
diff --git a/src/lte/wscript b/src/lte/wscript
--- a/src/lte/wscript
+++ b/src/lte/wscript
@@ -2,7 +2,7 @@
 
 def build(bld):
 
-    lte_module_dependencies = ['core', 'network', 'spectrum', 'stats', 'buildings', 'virtual-net-device','point-to-point','applications','internet','csma']
+    lte_module_dependencies = ['spectrum', 'stats', 'buildings', 'virtual-net-device', 'point-to-point', 'applications', 'internet', 'csma']
     if (bld.env['ENABLE_EMU']):
         lte_module_dependencies.append('fd-net-device')
     module = bld.create_ns3_module('lte', lte_module_dependencies)
diff --git a/src/mpi/wscript b/src/mpi/wscript
--- a/src/mpi/wscript
+++ b/src/mpi/wscript
@@ -33,7 +33,7 @@
 
 def build(bld):
     env = bld.env
-    sim = bld.create_ns3_module('mpi', ['core', 'network'])
+    sim = bld.create_ns3_module('mpi', ['network'])
     sim.source = [
         'model/distributed-simulator-impl.cc',
         'model/granted-time-window-mpi-interface.cc',
diff --git a/src/sixlowpan/wscript b/src/sixlowpan/wscript
--- a/src/sixlowpan/wscript
+++ b/src/sixlowpan/wscript
@@ -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('sixlowpan', ['internet', 'network', 'core'])
+    module = bld.create_ns3_module('sixlowpan', ['internet'])
     module.includes = '.'
     module.source = [
         'model/sixlowpan-net-device.cc',
diff --git a/src/tap-bridge/wscript b/src/tap-bridge/wscript
--- a/src/tap-bridge/wscript
+++ b/src/tap-bridge/wscript
@@ -28,7 +28,7 @@
     if not bld.env['ENABLE_TAP']:
         return
 
-    module = bld.create_ns3_module('tap-bridge', ['internet', 'network', 'core'])
+    module = bld.create_ns3_module('tap-bridge', ['internet'])
     module.source = [
         'model/tap-bridge.cc',
         'model/tap-encode-decode.cc',
diff --git a/src/wave/wscript b/src/wave/wscript
--- a/src/wave/wscript
+++ b/src/wave/wscript
@@ -7,7 +7,7 @@
 #     conf.check_nonfatal(header_name='stdint.h', define_name='HAVE_STDINT_H')
 
 def build(bld):
-    module = bld.create_ns3_module('wave', ['core','wifi', 'propagation', 'internet'])
+    module = bld.create_ns3_module('wave', ['wifi', 'propagation', 'internet'])
     module.source = [
         'model/wave-mac-low.cc',
         'model/ocb-wifi-mac.cc',
diff --git a/src/wimax/wscript b/src/wimax/wscript
--- a/src/wimax/wscript
+++ b/src/wimax/wscript
@@ -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', 'internet', 'propagation', 'mobility'])
+    obj = bld.create_ns3_module('wimax', ['internet', 'propagation', 'mobility'])
     obj.source = [
             'model/cid.cc',
             'model/cid-factory.cc',