Adapt the flow-monitor module to the new module tree layout spec.

examples/flowmon/waf

@@ -1 +0,0 @@
-exec "`dirname "$0"`"/../../waf "$@"

examples/flowmon/wscript

@@ -1,4 +0,0 @@
-## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
-
-def build(bld):
-    pass

src/contrib/flow-monitor/helper/flow-monitor-helper.h

@@ -20,7 +20,7 @@
 #ifndef FLOW_MONITOR_HELPER_H
 #define FLOW_MONITOR_HELPER_H
 
-#include "node-container.h"
+#include "ns3/node-container.h"
 #include "ns3/object-factory.h"
 #include "ns3/flow-monitor.h"
 #include "ns3/flow-classifier.h"

src/contrib/flow-monitor/wscript

@@ -2,22 +2,24 @@
 
 def build(bld):
     obj = bld.create_ns3_module('flow-monitor', ['internet-stack'])
-    obj.source = [
+    obj.source = ["model/%s" % s for s in [
        'flow-monitor.cc',
        'flow-classifier.cc',
        'flow-probe.cc',
        'ipv4-flow-classifier.cc',
        'ipv4-flow-probe.cc',
        'histogram.cc',	
-        ]
+        ]]
+    obj.source.append("helper/flow-monitor-helper.cc")
+
     headers = bld.new_task_gen('ns3header')
     headers.module = 'flow-monitor'
-    headers.source = [
+    headers.source = ["model/%s" % s for s in [
        'flow-monitor.h',
        'flow-probe.h',
        'flow-classifier.h',
        'ipv4-flow-classifier.h',
        'ipv4-flow-probe.h',
        'histogram.h',
-        ]
-
+        ]]
+    headers.source.append("helper/flow-monitor-helper.h")

src/helper/wscript

@@ -42,7 +42,6 @@ def build(bld):
         'ipv6-list-routing-helper.cc',
         'ipv6-routing-helper.cc',
         'ping6-helper.cc',
-        'flow-monitor-helper.cc',
         'animation-interface.cc',
         'canvas-location.cc',
         'point-to-point-dumbbell-helper.cc',
@@ -100,7 +99,6 @@ def build(bld):
         'ipv6-list-routing-helper.h',
         'ipv6-routing-helper.h',
         'ping6-helper.h',
-        'flow-monitor-helper.h',
         'animation-interface.h',
         'canvas-location.h',
         'point-to-point-dumbbell-helper.h',