Partial commit: Move macrotool to subfolder.

1 files changed, 5 insertions, 38 deletions

diff --git a/server/src/Makefile.am b/server/src/Makefile.am
index 26a14e2..0170390 100644
--- a/server/src/Makefile.am
+++ b/server/src/Makefile.am
@@ -1,5 +1,6 @@
+SUBDIRS = macrotool
 
-bin_PROGRAMS = pracrod macrotool
+bin_PROGRAMS = pracrod
 
 pracrod_LDADD = $(LD_EFENCE) $(PQXX_LIBS) $(CONFIG_LIBS) \
 	$(LUA_LIBS) $(HTTPD_LIBS) $(PTHREAD_LIBS) \
@@ -56,40 +57,10 @@ pracrod_SOURCES = \
 	tcpsocket.cc \
 	utf8.cc \
 	versionstr.cc \
+	widgetvalue.cc \
 	widgetgenerator.cc \
 	xml_encode_decode.cc
 
-macrotool_LDADD = $(LD_EFENCE) $(PQXX_LIBS) $(CONFIG_LIBS) \
-	$(LUA_LIBS) $(PTHREAD_LIBS) $(EXPAT_LIBS)
-
-macrotool_CXXFLAGS = $(PQXX_CXXFLAGS) $(CONFIG_CXXFLAGS) \
-	$(LUA_CXXFLAGS) $(PTHREAD_CFLAGS) $(EXPAT_CFLAGS)
-
-macrotool_SOURCES = \
-	macrotool.cc \
-	debug.cc \
-	configuration.cc \
-	configurationparser.cc \
-	database.cc \
-	entitylist.cc \
-	exception.cc \
-	inotify.cc \
-	log.cc \
-	macroheaderparser.cc \
-	macrolist.cc \
-	macroparser.cc \
-	macrotool_dump.cc \
-	macrotool_fieldnames.cc \
-	macrotool_filehandler.cc \
-	macrotool_util.cc \
-	mutex.cc \
-	pracrodao.cc \
-	pracrodaopgsql.cc \
-	pracrodaotest.cc \
-	saxparser.cc \
-	templateparser.cc \
-	versionstr.cc
-
 EXTRA_DIST = \
 	artefact.h \
 	configuration.h \
@@ -115,10 +86,6 @@ EXTRA_DIST = \
 	macroheaderparser.h \
 	macrolist.h \
 	macroparser.h \
-	macrotool_dump.h \
-	macrotool_fieldnames.h \
-	macrotool_filehandler.h \
-	macrotool_util.h \
 	mutex.h \
 	pracrodao.h \
 	pracrodaopgsql.h \
@@ -142,6 +109,7 @@ EXTRA_DIST = \
 	tcpsocket.h \
 	utf8.h \
 	versionstr.h \
+	widgetvalue.h \
 	widgetgenerator.h \
 	xml_encode_decode.h
 
@@ -149,8 +117,7 @@ EXTRA_DIST = \
 # Test Section #
 ################
 
-TEST_SOURCE_DEPS = ${pracrod_SOURCES} ${macrotool_SOURCES} \
-	${EXTRA_DIST}
+TEST_SOURCE_DEPS = ${pracrod_SOURCES} ${EXTRA_DIST}
 TEST_SCRIPT_DIR = $(top_srcdir)/../tools
 
 include ${TEST_SCRIPT_DIR}/Makefile.am.test