Remove non-source files from source directories: Use source and binary

directories, and modify build system.


git-svn-id: https://svn.microneil.com/svn/PKG-SNF4CGP-NIX/trunk@102 7ef522f6-be79-40a8-b7df-0a85b3383509

SNF4CGP_Developer_Package/Makefile.am

@@ -11,15 +11,51 @@
 ##
 
 SUBDIRS = 			\
-	CodeDweller		\
-	SNFMulti		\
-	SNF4CGP               	\
-	SNF2Check		\
-	SNFClient		\
+	binary/SNF4CGP          \
+	binary/SNF2Check	\
+	binary/SNFClient	\
 	Scripts			\
 	config_files		\
 	Doc
 
+noinst_HEADERS =                    			          \
+	@top_srcdir@/source/SNF4CGP/Command.hpp		          \
+	@top_srcdir@/source/SNF4CGP/ConfigurationEngine.hpp	  \
+	@top_srcdir@/source/SNF4CGP/ExecutiveProcess.hpp	  \
+	@top_srcdir@/source/SNF4CGP/InputProcessor.hpp		  \
+	@top_srcdir@/source/SNF4CGP/JobPool.hpp		          \
+	@top_srcdir@/source/SNF4CGP/OutputProcessor.hpp	          \
+	@top_srcdir@/source/SNF4CGP/ScannerPool.hpp		  \
+	@top_srcdir@/source/SNF4CGP/WorkerPool.hpp                \
+	@top_srcdir@/source/CodeDweller/base64codec.hpp		  \
+	@top_srcdir@/source/CodeDweller/configuration.hpp	  \
+	@top_srcdir@/source/CodeDweller/configuration.inline.hpp  \
+	@top_srcdir@/source/CodeDweller/histogram.hpp		  \
+	@top_srcdir@/source/CodeDweller/networking.hpp		  \
+	@top_srcdir@/source/CodeDweller/networking.inline.hpp	  \
+	@top_srcdir@/source/CodeDweller/threading.hpp		  \
+	@top_srcdir@/source/CodeDweller/faults.hpp		  \
+	@top_srcdir@/source/CodeDweller/mangler.hpp		  \
+	@top_srcdir@/source/CodeDweller/timing.hpp                \
+	@top_srcdir@/source/SNFMulti/FilterChain.hpp		  \
+	@top_srcdir@/source/SNFMulti/GBUdb.hpp			  \
+	@top_srcdir@/source/SNFMulti/GBUdb.inline.hpp		  \
+	@top_srcdir@/source/SNFMulti/scanner.hpp		  \
+	@top_srcdir@/source/SNFMulti/snfCFGmgr.hpp		  \
+	@top_srcdir@/source/SNFMulti/snfCFGmgr.inline.hpp	  \
+	@top_srcdir@/source/SNFMulti/snf_engine.hpp		  \
+	@top_srcdir@/source/SNFMulti/snfGBUdbmgr.hpp		  \
+	@top_srcdir@/source/SNFMulti/snf_HeaderFinder.hpp	  \
+	@top_srcdir@/source/SNFMulti/snf_HeaderFinder.inline.hpp  \
+	@top_srcdir@/source/SNFMulti/snfLOGmgr.hpp		  \
+	@top_srcdir@/source/SNFMulti/snfLOGmgr.inline.hpp	  \
+	@top_srcdir@/source/SNFMulti/SNFMulti.hpp		  \
+	@top_srcdir@/source/SNFMulti/snfNETmgr.hpp		  \
+	@top_srcdir@/source/SNFMulti/snf_sync.hpp		  \
+	@top_srcdir@/source/SNFMulti/snf_xci.hpp		  \
+	@top_srcdir@/source/SNFMulti/snfXCImgr.hpp		  \
+	@top_srcdir@/source/SNFMulti/snf_match.h
+
 doc_DATA =			\
 	BUGS			\
 	ChangeLog  		\
@@ -43,9 +79,9 @@ module:
 	mkdir $(MOD_PATH)
 	chmod 2770 $(MOD_PATH)
 	mkdir $(MOD_PATH)/hold $(MOD_PATH)/Doc
-	cp SNF4CGP/SNF4CGP $(MOD_PATH)/CGPSNF
-	cp SNFClient/SNFClient $(MOD_PATH)
-	cp SNF2Check/SNF2Check $(MOD_PATH)
+	cp binary/SNF4CGP/SNF4CGP $(MOD_PATH)/CGPSNF
+	cp binary/SNFClient/SNFClient $(MOD_PATH)
+	cp binary/SNF2Check/SNF2Check $(MOD_PATH)
 	cp Scripts/getRulebase.sample $(MOD_PATH)
 	cp Scripts/junkmsg.txt $(MOD_PATH)
 	cp Scripts/cleanmsg.txt $(MOD_PATH)

SNF4CGP_Developer_Package/binary/SNF2Check/Makefile.am

@@ -0,0 +1,47 @@
+## Process this file with automake to produce Makefile.in
+##
+## $Id$
+##
+## automake input for the MicroNeil SNF2Check application.
+##
+## Author:  Alban Deniz
+##
+## Copyright (C) 2008 ARM Research Labs, LLC.
+## See www.armresearch.com for the copyright terms.
+##
+##
+
+LIBS = @SNF_LIBS@ @LIBS@
+CXXFLAGS = $(SNF_CXXFLAGS) -I@top_srcdir@/source/SNFMulti      \
+-I@top_srcdir@/source/CodeDweller
+
+sbin_PROGRAMS =               				       \
+	SNF2Check
+
+SNF2Check_SOURCES =        				       \
+	@top_srcdir@/source/SNF2Check/main.cpp                 \
+	@top_srcdir@/source/CodeDweller/base64codec.cpp	       \
+	@top_srcdir@/source/CodeDweller/configuration.cpp      \
+	@top_srcdir@/source/CodeDweller/networking.cpp	       \
+	@top_srcdir@/source/CodeDweller/threading.cpp	       \
+	@top_srcdir@/source/CodeDweller/mangler.cpp	       \
+	@top_srcdir@/source/CodeDweller/timing.cpp             \
+	@top_srcdir@/source/SNFMulti/FilterChain.cpp	       \
+	@top_srcdir@/source/SNFMulti/GBUdb.cpp		       \
+	@top_srcdir@/source/SNFMulti/scanner.cpp	       \
+	@top_srcdir@/source/SNFMulti/snfCFGmgr.cpp	       \
+	@top_srcdir@/source/SNFMulti/snf_engine.cpp	       \
+	@top_srcdir@/source/SNFMulti/snfGBUdbmgr.cpp	       \
+	@top_srcdir@/source/SNFMulti/snf_HeaderFinder.cpp      \
+	@top_srcdir@/source/SNFMulti/snfLOGmgr.cpp	       \
+	@top_srcdir@/source/SNFMulti/SNFMulti.cpp	       \
+	@top_srcdir@/source/SNFMulti/snfNETmgr.cpp	       \
+	@top_srcdir@/source/SNFMulti/snf_sync.cpp	       \
+	@top_srcdir@/source/SNFMulti/snf_xci.cpp	       \
+	@top_srcdir@/source/SNFMulti/snfXCImgr.cpp
+
+EXTRA_DIST = 						\
+	Makefile.am
+
+clean-local:
+	rm -f *.gcno *.gcov *.gcda *~

SNF4CGP_Developer_Package/binary/SNF4CGP/Makefile.am

@@ -0,0 +1,60 @@
+## Process this file with automake to produce Makefile.in
+##
+## $Id$
+##
+## automake input for the MicroNeil SNF4CGP application (SNF4CGP directory).
+##
+## Author:  Alban Deniz
+##
+## Copyright (C) 2009 ARM Research Labs, LLC.
+## See www.armresearch.com for the copyright terms.
+##
+##
+
+LIBS = @SNF_LIBS@ @LIBS@
+CXXFLAGS = $(SNF_CXXFLAGS) -I@top_srcdir@/source/SNFMulti \
+-I@top_srcdir@/source/CodeDweller -I@top_srcdir@/source/SNF4CGP
+
+sbin_PROGRAMS =               			\
+	SNF4CGP
+
+SNF4CGP_SOURCES =        				       \
+	@top_srcdir@/source/SNF4CGP/ConfigurationEngine.cpp    \
+	@top_srcdir@/source/SNF4CGP/ExecutiveProcess.cpp       \
+	@top_srcdir@/source/SNF4CGP/InputProcessor.cpp	       \
+	@top_srcdir@/source/SNF4CGP/JobPool.cpp		       \
+	@top_srcdir@/source/SNF4CGP/main.cpp		       \
+	@top_srcdir@/source/SNF4CGP/OutputProcessor.cpp	       \
+	@top_srcdir@/source/SNF4CGP/ScannerPool.cpp	       \
+	@top_srcdir@/source/SNF4CGP/WorkerPool.cpp             \
+	@top_srcdir@/source/CodeDweller/base64codec.cpp	       \
+	@top_srcdir@/source/CodeDweller/configuration.cpp      \
+	@top_srcdir@/source/CodeDweller/networking.cpp	       \
+	@top_srcdir@/source/CodeDweller/threading.cpp	       \
+	@top_srcdir@/source/CodeDweller/mangler.cpp	       \
+	@top_srcdir@/source/CodeDweller/timing.cpp             \
+	@top_srcdir@/source/SNFMulti/FilterChain.cpp	       \
+	@top_srcdir@/source/SNFMulti/GBUdb.cpp		       \
+	@top_srcdir@/source/SNFMulti/scanner.cpp	       \
+	@top_srcdir@/source/SNFMulti/snfCFGmgr.cpp	       \
+	@top_srcdir@/source/SNFMulti/snf_engine.cpp	       \
+	@top_srcdir@/source/SNFMulti/snfGBUdbmgr.cpp	       \
+	@top_srcdir@/source/SNFMulti/snf_HeaderFinder.cpp      \
+	@top_srcdir@/source/SNFMulti/snfLOGmgr.cpp	       \
+	@top_srcdir@/source/SNFMulti/SNFMulti.cpp	       \
+	@top_srcdir@/source/SNFMulti/snfNETmgr.cpp	       \
+	@top_srcdir@/source/SNFMulti/snf_sync.cpp	       \
+	@top_srcdir@/source/SNFMulti/snf_xci.cpp	       \
+	@top_srcdir@/source/SNFMulti/snfXCImgr.cpp
+
+EXTRA_DIST = 						\
+	Makefile.am
+
+install-exec-hook:
+	ln -f $(DESTDIR)$(sbindir)/SNF4CGP$(EXEEXT) $(DESTDIR)$(sbindir)/SNFDebug4CGP$(EXEEXT)
+
+uninstall-hook:
+	rm -f $(DESTDIR)$(sbindir)/SNFDebug4CGP$(EXEEXT)
+
+clean-local:
+	rm -f *.gcno *.gcov *.gcda *~ $(CONFDATA)

SNF4CGP_Developer_Package/binary/SNFClient/Makefile.am

@@ -0,0 +1,47 @@
+## Process this file with automake to produce Makefile.in
+##
+## $Id$
+##
+## automake input for the MicroNeil SNFClient application.
+##
+## Author:  Alban Deniz
+##
+## Copyright (C) 2008 ARM Research Labs, LLC.
+## See www.armresearch.com for the copyright terms.
+##
+##
+
+LIBS = @SNF_LIBS@ @LIBS@
+CXXFLAGS = $(SNF_CXXFLAGS) -I@top_srcdir@/source/SNFMulti      \
+-I@top_srcdir@/source/CodeDweller
+
+sbin_PROGRAMS =               			               \
+	SNFClient
+
+SNFClient_SOURCES =        		  	               \
+	@top_srcdir@/source/SNFClient/main.cpp                 \
+	@top_srcdir@/source/CodeDweller/base64codec.cpp	       \
+	@top_srcdir@/source/CodeDweller/configuration.cpp      \
+	@top_srcdir@/source/CodeDweller/networking.cpp	       \
+	@top_srcdir@/source/CodeDweller/threading.cpp	       \
+	@top_srcdir@/source/CodeDweller/mangler.cpp	       \
+	@top_srcdir@/source/CodeDweller/timing.cpp             \
+	@top_srcdir@/source/SNFMulti/FilterChain.cpp	       \
+	@top_srcdir@/source/SNFMulti/GBUdb.cpp		       \
+	@top_srcdir@/source/SNFMulti/scanner.cpp	       \
+	@top_srcdir@/source/SNFMulti/snfCFGmgr.cpp	       \
+	@top_srcdir@/source/SNFMulti/snf_engine.cpp	       \
+	@top_srcdir@/source/SNFMulti/snfGBUdbmgr.cpp	       \
+	@top_srcdir@/source/SNFMulti/snf_HeaderFinder.cpp      \
+	@top_srcdir@/source/SNFMulti/snfLOGmgr.cpp	       \
+	@top_srcdir@/source/SNFMulti/SNFMulti.cpp	       \
+	@top_srcdir@/source/SNFMulti/snfNETmgr.cpp	       \
+	@top_srcdir@/source/SNFMulti/snf_sync.cpp	       \
+	@top_srcdir@/source/SNFMulti/snf_xci.cpp	       \
+	@top_srcdir@/source/SNFMulti/snfXCImgr.cpp
+
+EXTRA_DIST = 						       \
+	Makefile.am
+
+clean-local:
+	rm -f *.gcno *.gcov *.gcda *~

SNF4CGP_Developer_Package/configure.ac

@@ -14,7 +14,7 @@ dnl
 AC_PREREQ(2.52)
 
 AC_INIT(snf4cgp, 0.1.4)
-AC_CONFIG_SRCDIR(SNF4CGP/OutputProcessor.cpp)
+AC_CONFIG_SRCDIR(source/SNF4CGP/OutputProcessor.cpp)
 AC_CONFIG_AUX_DIR(config)
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
 
@@ -73,11 +73,9 @@ dnl Output the makefiles.
 dnl
 
 AC_OUTPUT([Makefile
-        CodeDweller/Makefile
-        SNFMulti/Makefile
-	SNF4CGP/Makefile
-	SNF2Check/Makefile
-	SNFClient/Makefile
+	binary/SNF4CGP/Makefile
+	binary/SNF2Check/Makefile
+	binary/SNFClient/Makefile
 	Scripts/Makefile
 	Doc/Makefile
 	config_files/Makefile])