moved ns3 from under daemon to the root of the project and updated references

Makefile.am

@@ -17,7 +17,7 @@ if WANT_DAEMON
   DAEMON		= scripts daemon
 endif
 if WANT_NETNS
-  NETNS 		= netns
+  NETNS 		= netns ns3
 endif
 
 # keep docs last due to dependencies on binaries
@@ -138,8 +138,8 @@ endef
 fpm: clean-local-fpm
 	$(call fpm-gui,rpm,-d "tkimg")
 	$(call fpm-gui,deb,-d "libtk-img")
-	$(call fpm-python,rpm,daemon/ns3/setup.py)
-	$(call fpm-python,deb,daemon/ns3/setup.py)
+	$(call fpm-python,rpm,ns3/setup.py)
+	$(call fpm-python,deb,ns3/setup.py)
 	$(call fpm-daemon-rpm,systemd)
 	$(call fpm-daemon-rpm,sysv)
 	$(call fpm-daemon-deb,systemd)

configure.ac

@@ -331,13 +331,13 @@ AC_CONFIG_FILES([Makefile
 		doc/man/Makefile
 		doc/figures/Makefile
 		daemon/Makefile
-		netns/Makefile
-		netns/version.h
 		daemon/core/constants.py
-		daemon/ns3/Makefile
-		daemon/ns3/corens3/constants.py
 		daemon/doc/Makefile
 		daemon/doc/conf.py
+		netns/Makefile
+		netns/version.h
+		ns3/Makefile
+		ns3/corens3/constants.py
 		packaging/deb/core-daemon.install
 		packaging/deb/core-daemon.prerm
 		packaging/deb/core-gui.install

daemon/Makefile.am

@@ -10,10 +10,6 @@
 SETUPPY		= setup.py
 SETUPPYFLAGS	= -v
 
-if WANT_NETNS
-  SUBDIRS 	= ns3
-endif
-
 SBIN_FILES		=			\
 	sbin/core-cleanup			\
 	sbin/core-daemon			\

doc/ns3.rst

@@ -47,7 +47,7 @@ ns-3 Scripting
 Currently, ns-3 is supported by writing
 :ref:`Python scripts <Python_Scripting>`, but not through
 drag-and-drop actions within the GUI.
-If you have a copy of the CORE source, look under :file:`core/daemon/ns3/examples/` for example scripts; a CORE installation package puts these under
+If you have a copy of the CORE source, look under :file:`ns3/examples/` for example scripts; a CORE installation package puts these under
 :file:`/usr/share/core/examples/corens3`.
 
 To run these scripts, install CORE so the CORE Python libraries are accessible,
@@ -168,8 +168,8 @@ a constant-rate 802.11a-based ad hoc network, using a lot of ns-3 defaults.
 However, programs may be written with a blend of ns-3 API and CORE Python
 API calls.  This section examines some of the fundamental objects in
 the CORE ns-3 support.  Source code can be found in 
-:file:`daemon/ns3/corens3/obj.py` and example
-code in :file:`daemon/ns3/corens3/examples/`.
+:file:`ns3/corens3/obj.py` and example
+code in :file:`ns3/corens3/examples/`.
 
 Ns3Session
 ----------

ns3/.gitignore

@@ -0,0 +1 @@
+build