Remove non-source files from source directories.

git-svn-id: https://svn.microneil.com/svn/PKG-SNF-CS-NIX/trunk@96 233e721a-07f6-49eb-a7da-05e0e16828fc

SNF_CS_Developer_Package/DEVELOPER_NOTES

@@ -68,39 +68,30 @@ The following files comprise the build system:
 
   2) Makefile.am.  This is used to create the top-level Makefile.  It
   lists which directories are part of the build system
-  (e.g. SNFServer), and which extra files are to be part of the
+  (e.g. binary/SNFServer), and which extra files are to be part of the
   distribution (e.g. BUGS, README, etc).
 
-  3) CodeDweller/Makefile.am.  This is used to create the Makefile for
-  the CodeDweller library.  It lists which source files are to be used
-  for building.
+  3) Makefile.am in each directory: binary/SNFServer,
+  binary/SNFClient, binary/SNF2Check, binary/SNFServerConfig, Scripts,
+  Tests, and config_files.  These are used to create the Makefile
+  files for building, configuring and installing the software.  These
+  Makefile.am files contain lists which source files are to be used
+  for building, and directions to generate the configuration files.
 
-  3) SNFMulti/Makefile.am.  This is used to create the Makefile for
-  the SNFMulti library.  It lists which source files are to be used
-  for building.
-
-  4) SNFClient/Makefile.am.  This is used to create the Makefile for
-  SNFClient.
-
-  5) SNF2Check/Makefile.am.  This is used to create the Makefile for
-  SNF2Check.
-
-  6) Scripts/Makefile.am.  This is used to create the Makefile for
-  scripts (getRulebase, OS startup/shutdown, snfSniffer, etc).
-
-During the build process, the files in SNFMulti and CodeDweller are
-compiled into a static library.  The applications SNFServer,
-SNFClient, and SNF2Check link with these libraries.  This library is
-not installed.  The system checks the dates of the files, and
+During the build process, the binary/<AppName> directories (where
+<AppName> is the name of the executable) are populated with the object
+files and executable.  The system checks the dates of the files, and
 recompiles and relinks as necessary.
 
 To add an additional source file , edit the appropriate Makefile.am.
 Add the source file to the appropriate variable.  For example, in
-SNFServer/Makefile.am:
+binary/SNFServer/Makefile.am:
 
   1) SNFServer_SOURCES for the cpp files for SNFServer.
 
-  2) noinst_HEADERS for the header files for SNFServer.  These are
+In the top-level Makefile.am:
+
+  1) noinst_HEADERS for the header files for SNFServer.  These are
   part of the user tarball, but aren't installed into the user system.
 
 Note that files that are not listed will not be included in the

SNF_CS_Developer_Package/Makefile.am

@@ -12,18 +12,51 @@
 ##
 
 SUBDIRS = 				\
-	CodeDweller			\
-	SNFMulti			\
-	SNFServer			\
-	SNFClient			\
-	SNF2Check			\
-	SNFUtility/Common		\
-	SNFUtility/CommonTests		\
-	SNFUtility/SNFServerConfig	\
+	binary/SNFServer       	        \
+	binary/SNFClient                \
+	binary/SNF2Check                \
+	binary/SNFServerConfig          \
 	Scripts				\
 	config_files			\
 	Docs
 
+noinst_HEADERS =                    				  \
+	@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                  \
+	@top_srcdir@/source/SNFUtility/Common/Utility.hpp         \
+	@top_srcdir@/source/SNFUtility/Common/UtilityConfig.hpp   \
+	@top_srcdir@/source/SNFUtility/Common/MtaIntegrate.hpp    \
+	@top_srcdir@/source/SNFUtility/Common/FileBackup.hpp      \
+	@top_srcdir@/source/SNFUtility/SNFServerConfig/SNFServerConfig.hpp   \
+	@top_srcdir@/source/SNFUtility/SNFServerConfig/PostfixIntegrate.hpp  \
+	@top_srcdir@/source/SNFUtility/SNFServerConfig/SendmailIntegrate.hpp
+
 doc_DATA =				\
 	BUGS				\
 	ChangeLog  			\

SNF_CS_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 *~

SNF_CS_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 *~

SNF_CS_Developer_Package/binary/SNFServer/Makefile.am

@@ -0,0 +1,53 @@
+## Process this file with automake to produce Makefile.in
+##
+## $Id$
+##
+## automake input for the MicroNeil SNFServer application (SNFServer directory).
+##
+## 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 =               				\
+	SNFServer
+
+SNFServer_SOURCES =        				       \
+	@top_srcdir@/source/SNFServer/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
+
+install-exec-hook:
+	ln -f $(DESTDIR)$(sbindir)/SNFServer$(EXEEXT) $(DESTDIR)$(sbindir)/SNFDebugServer$(EXEEXT)
+
+uninstall-hook:
+	rm -f $(DESTDIR)$(sbindir)/SNFDebugServer$(EXEEXT)
+
+clean-local:
+	rm -f *.gcno *.gcov *.gcda *~ $(CONFDATA)

SNF_CS_Developer_Package/binary/SNFServerConfig/Makefile.am

@@ -0,0 +1,69 @@
+## Process this file with automake to produce Makefile.in
+##
+## $Id$
+##
+## automake input for the MicroNeil SNFServerConfig application.
+##
+## Author:  Alban Deniz
+##
+## Copyright (C) 2012 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/SNFUtility/Common           \
+-I@top_srcdir@/source/SNFServerConfig/Common      \
+-DDEFAULT_CONFIG_DIR=\"@sysconfdir@\"             \
+-DDOC_DIR=\"@docdir@\"                            \
+-DSNF_OSTYPE=\"$(SNF_OSTYPE)\"                    \
+-DDEFAULT_DATA_DIR=\"@datadir@/$(PACKAGE_NAME)\"  \
+-DSBIN_DIR=\"$(DESTDIR)$(sbindir)\"
+
+sbin_PROGRAMS =               			                           \
+	SNFServerConfig
+
+SNFServerConfig_SOURCES =        				              \
+	@top_srcdir@/source/SNFUtility/SNFServerConfig/main.cpp               \
+	@top_srcdir@/source/SNFUtility/SNFServerConfig/SNFServerConfig.cpp    \
+	@top_srcdir@/source/SNFUtility/SNFServerConfig/PostfixIntegrate.cpp   \
+	@top_srcdir@/source/SNFUtility/SNFServerConfig/SendmailIntegrate.cpp  \
+	@top_srcdir@/source/SNFUtility/Common/FileBackup.cpp                  \
+	@top_srcdir@/source/SNFUtility/Common/MtaIntegrate.cpp                \
+	@top_srcdir@/source/SNFUtility/Common/UtilityConfig.cpp               \
+	@top_srcdir@/source/SNFUtility/Common/Utility.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)/SNFServerConfig$(EXEEXT) $(DESTDIR)$(sbindir)/SNFDebugServerConfig$(EXEEXT)
+
+uninstall-hook:
+	rm -f $(DESTDIR)$(sbindir)/SNFDebugServerConfig$(EXEEXT)
+
+clean-local:
+	rm -f *.gcno *.gcov *.gcda *~ $(CONFDATA)

SNF_CS_Developer_Package/configure.ac.in

@@ -14,7 +14,7 @@ dnl
 AC_PREREQ(2.52)
 
 AC_INIT(snf-server, REPLACE_WITH_VERSION)
-AC_CONFIG_SRCDIR(SNFMulti/snfCFGmgr.cpp)
+AC_CONFIG_SRCDIR(source/SNFMulti/snfCFGmgr.cpp)
 AC_CONFIG_AUX_DIR(config)
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
 
@@ -109,14 +109,10 @@ AC_OUTPUT([Makefile
         ${PACKAGE_NAME}.spec
         ${PACKAGE_NAME}-postfix.spec
         ${PACKAGE_NAME}-sendmail.spec
-        CodeDweller/Makefile
-        SNFMulti/Makefile
-	SNFServer/Makefile
- 	SNFClient/Makefile
-        SNF2Check/Makefile
-	SNFUtility/Common/Makefile
-	SNFUtility/CommonTests/Makefile
-	SNFUtility/SNFServerConfig/Makefile
+	binary/SNFServer/Makefile
+ 	binary/SNFClient/Makefile
+        binary/SNF2Check/Makefile
+	binary/SNFServerConfig/Makefile
         Scripts/Makefile
         config_files/Makefile
         Docs/Makefile])