Move flow-monitor module out of contrib directory

src/flow-monitor/test/examples-to-run.py

@@ -7,9 +7,7 @@
 #     (example_name, do_run, do_valgrind_run).
 #
 # See test.py for more information.
-cpp_examples = [
-    ("wifi-olsr-flowmon.py", "True"),
-]
+cpp_examples = []
 
 # A list of Python examples to run in order to ensure that they remain
 # runnable over time.  Each tuple in the list contains
@@ -17,4 +15,6 @@ cpp_examples = [
 #     (example_name, do_run).
 #
 # See test.py for more information.
-python_examples = []
+python_examples = [
+    ("wifi-olsr-flowmon.py", "True"),
+]

src/wscript

@@ -49,7 +49,7 @@ all_modules = (
     'test',
     'test/ns3tcp',
     'test/ns3wifi',
-    'contrib/flow-monitor',
+    'flow-monitor',
     'wimax',
     'lte',
     'mpi',