Moves mesh, flame and dot11s examples and helpers to respective module folders

src/dot11s/wscript

@@ -23,6 +23,7 @@ def build(bld):
         'model/hwmp-protocol-mac.cc',
         'model/hwmp-protocol.cc',
         'model/airtime-metric.cc',
+        'helper/dot11s-installer.cc',
         'test/dot11s-test-suite.cc',
         'test/pmp-regression.cc',
         'test/hwmp-reactive-regression.cc',
@@ -51,4 +52,5 @@ def build(bld):
         'model/ie-dot11s-prep.h',
         'model/ie-dot11s-preq.h',
         'model/ie-dot11s-rann.h',
+        'helper/dot11s-installer.h',
         ]

src/flame/wscript

@@ -7,6 +7,7 @@ def build(bld):
         'model/flame-rtable.cc',
         'model/flame-protocol-mac.cc',
         'model/flame-protocol.cc',
+        'helper/flame-installer.cc',
         'test/flame-test-suite.cc',
         'test/flame-regression.cc',
         'test/regression.cc',
@@ -18,4 +19,5 @@ def build(bld):
         'model/flame-header.h',
         'model/flame-rtable.h',
         'model/flame-protocol-mac.h',
+        'helper/flame-installer.h',
         ]

src/helper/wscript

@@ -3,9 +3,6 @@
 def build(bld):
     helper = bld.create_ns3_module('helper', ['mobility', 'network', 'internet', 'wifi', 'point-to-point', 'spectrum'])
     helper.source = [
-        'mesh-helper.cc',
-        'dot11s-installer.cc',
-        'flame-installer.cc',
         'athstats-helper.cc',
         'animation-interface.cc',
         'canvas-location.cc',
@@ -15,10 +12,6 @@ def build(bld):
     headers = bld.new_task_gen('ns3header')
     headers.module = 'helper'
     headers.source = [
-        'mesh-helper.h',
-        'mesh-stack-installer.h',
-        'dot11s-installer.h',
-        'flame-installer.h',
         'athstats-helper.h',
         'animation-interface.h',
         'canvas-location.h',

src/mesh/wscript

@@ -9,6 +9,7 @@ def build(bld):
         'model/mesh-l2-routing-protocol.cc',
         'model/mesh-wifi-beacon.cc',
         'model/mesh-wifi-interface-mac.cc',
+        'helper/mesh-helper.cc',
         ]
     headers = bld.new_task_gen('ns3header')
     headers.module = 'mesh'
@@ -20,4 +21,9 @@ def build(bld):
         'model/mesh-wifi-beacon.h',
         'model/mesh-wifi-interface-mac.h',
         'model/mesh-wifi-interface-mac-plugin.h',
+        'helper/mesh-helper.h',
+        'helper/mesh-stack-installer.h',
         ]
+
+    if bld.env['ENABLE_EXAMPLES']:
+        bld.add_subdirs('examples')

test.py

@@ -114,7 +114,7 @@ example_tests = [
     ("examples/ipv6/radvd-two-prefix", "True", "True"),    
     ("examples/ipv6/test-ipv6", "True", "True"),
 
-    ("examples/mesh/mesh", "True", "True"),
+    ("src/mesh/examples/mesh", "True", "True"),
 
     ("examples/naming/object-names", "True", "True"),