summaryrefslogtreecommitdiff
path: root/server/src/Makefile.am
diff options
context:
space:
mode:
authordeva <deva>2010-06-01 12:58:32 +0000
committerdeva <deva>2010-06-01 12:58:32 +0000
commit74a28aa7125be6a603128ad600c98c4882f3b5c2 (patch)
tree1a9e4ab74f29d5ff10f2701e4e112f4525c0dcec /server/src/Makefile.am
parent9b9c1e2dd3e5807ff7714b378b03b9ba31f42df7 (diff)
From new_protocol branch.
Diffstat (limited to 'server/src/Makefile.am')
-rw-r--r--server/src/Makefile.am272
1 files changed, 48 insertions, 224 deletions
diff --git a/server/src/Makefile.am b/server/src/Makefile.am
index 98a154e..942ced5 100644
--- a/server/src/Makefile.am
+++ b/server/src/Makefile.am
@@ -2,25 +2,33 @@
bin_PROGRAMS = pracrod macrotool
pracrod_LDADD = $(LD_EFENCE) $(PQXX_LIBS) $(CONFIG_LIBS) \
- $(LUA_LIBS) $(HTTPD_LIBS) -lpthread $(ATF_LIBS)
+ $(LUA_LIBS) $(HTTPD_LIBS) $(PTHREAD_LIBS) \
+ $(EXPAT_LIBS) $(ATF_LIBS)
pracrod_CXXFLAGS = $(PQXX_CXXFLAGS) $(CONFIG_CXXFLAGS) \
- $(LUA_CXXFLAGS) $(HTTPD_CFLAGS) $(ATF_CFLAGS)
+ $(LUA_CXXFLAGS) $(HTTPD_CFLAGS) $(EXPAT_CFLAGS) \
+ $(PTHREAD_CFLAGS) $(ATF_CFLAGS)
pracrod_SOURCES = \
pracrod.cc \
+ artefact.cc \
daemon.cc \
database.cc \
configuration.cc \
configurationparser.cc \
+ connection.cc \
+ connectionpool.cc \
debug.cc \
+ entitylist.cc \
+ environment.cc \
exception.cc \
- queryhandlerpentominos.cc \
- queryhandlerpracro.cc \
+ inotify.cc \
journal_commit.cc \
+ journalwriter.cc \
log.cc \
luaquerymapper.cc \
luaresume.cc \
+ luautil.cc \
macroheaderparser.cc \
macrolist.cc \
macroparser.cc \
@@ -28,12 +36,20 @@ pracrod_SOURCES = \
pracrodao.cc \
pracrodaopgsql.cc \
pracrodaotest.cc \
+ queryhandlerpentominos.cc \
+ queryhandlerpracro.cc \
+ queryparser.cc \
resumeparser.cc \
saxparser.cc \
+ semaphore.cc \
server.cc \
+ session.cc \
+ sessionparser.cc \
+ sessionserialiser.cc \
templatelist.cc \
templateheaderparser.cc \
templateparser.cc \
+ transactionhandler.cc \
transactionparser.cc \
tcpsocket.cc \
utf8.cc \
@@ -41,9 +57,11 @@ pracrod_SOURCES = \
widgetgenerator.cc \
xml_encode_decode.cc
-macrotool_LDADD = $(LD_EFENCE) $(PQXX_LIBS) $(CONFIG_LIBS) $(LUA_LIBS) -lpthread
+macrotool_LDADD = $(LD_EFENCE) $(PQXX_LIBS) $(CONFIG_LIBS) \
+ $(LUA_LIBS) $(PTHREAD_LIBS) $(EXPAT_LIBS)
-macrotool_CXXFLAGS = $(PQXX_CXXFLAGS) $(CONFIG_CXXFLAGS) $(LUA_CXXFLAGS)
+macrotool_CXXFLAGS = $(PQXX_CXXFLAGS) $(CONFIG_CXXFLAGS) \
+ $(LUA_CXXFLAGS) $(PTHREAD_CFLAGS) $(EXPAT_CFLAGS)
macrotool_SOURCES = \
macrotool.cc \
@@ -51,7 +69,9 @@ macrotool_SOURCES = \
configuration.cc \
configurationparser.cc \
database.cc \
+ entitylist.cc \
exception.cc \
+ inotify.cc \
log.cc \
macroheaderparser.cc \
macrolist.cc \
@@ -69,20 +89,25 @@ macrotool_SOURCES = \
versionstr.cc
EXTRA_DIST = \
+ artefact.h \
configuration.h \
configurationparser.h \
+ connection.h \
+ connectionpool.h \
daemon.h \
database.h \
dbtypes.h \
debug.h \
+ environment.h \
+ entitylist.h \
exception.h \
- queryhandler.h \
- queryhandlerpentominos.h \
- queryhandlerpracro.h \
+ inotify.h \
journal_commit.h \
+ journalwriter.h \
log.h \
luaquerymapper.h \
luaresume.h \
+ luautil.h \
macroheaderparser.h \
macrolist.h \
macroparser.h \
@@ -94,15 +119,21 @@ EXTRA_DIST = \
pracrodao.h \
pracrodaopgsql.h \
pracrodaotest.h \
- queryresult.h \
+ queryhandler.h \
+ queryhandlerpentominos.h \
+ queryhandlerpracro.h \
+ queryparser.h \
resumeparser.h \
saxparser.h \
+ semaphore.h \
server.h \
- template.h \
+ session.h \
+ sessionparser.h \
+ sessionserialiser.h \
templatelist.h \
templateheaderparser.h \
templateparser.h \
- transaction.h \
+ transactionhandler.h \
transactionparser.h \
tcpsocket.h \
utf8.h \
@@ -114,217 +145,10 @@ EXTRA_DIST = \
# Test Section #
################
-TESTFILES = \
- test_tcpsocket \
- test_pracrodaotest \
- test_widgetgenerator \
- test_configurationparser \
- test_exception \
- test_templateheaderparser \
- test_macroheaderparser \
- test_templatelist \
- test_saxparser \
- test_transactionparser \
- test_versionstr \
- test_macrolist \
- test_queryhandlerpentominos \
- test_queryhandlerpracro \
- test_luaquerymapper \
- test_templateparser \
- test_server \
- test_pracrodaopgsql \
- test_macroparser \
- test_xml_encode_decode \
- test_journal_commit
-
-TESTLOGS = `for F in ${TESTFILES}; do echo $$F.log; done`
-
-BASICFILES = exception.cc log.cc debug.cc configuration.cc utf8.cc
-BASICFLAGS = -I.. -DHAVE_CONFIG_H $(CONFIG_CXXFLAGS) $(CONFIG_LIBS)
-
-PARSERFILES = saxparser.cc
-PARSERFLAGS = -lexpat
-
-DBFILES = database.cc pracrodao.cc pracrodaopgsql.cc pracrodaotest.cc mutex.cc
-DBFLAGS = $(PQXX_LIBS) $(PQXX_CXXFLAGS)
-
-test: $(TESTFILES)
- @echo "All tests done."
-
-test_clean:
- rm -f $(TESTFILES) $(TESTLOGS)
-
-TEST_TCPSOCKET_FILES = \
- tcpsocket.cc \
- $(BASICFILES)
-test_tcpsocket: $(TEST_TCPSOCKET_FILES)
- @../../tools/test $(TEST_TCPSOCKET_FILES) $(BASICFLAGS)
-
-TEST_PRACRODAOTEST_FILES = \
- pracrodaotest.cc \
- pracrodao.cc \
- $(BASICFILES)
-test_pracrodaotest: $(TEST_PRACRODAOTEST_FILES)
- @../../tools/test $(TEST_PRACRODAOTEST_FILES) $(BASICFLAGS)
-
-TEST_WIDGETGENERATOR_FILES = \
- widgetgenerator.cc \
- xml_encode_decode.cc \
- luaquerymapper.cc \
- $(BASICFILES) \
- $(DBFILES)
-test_widgetgenerator: $(TEST_WIDGETGENERATOR_FILES)
- @../../tools/test $(TEST_WIDGETGENERATOR_FILES) $(BASICFLAGS) $(LUA_LIBS) $(DBFLAGS)
-
-TEST_CONFIGURATIONPARSER_FILES = \
- configurationparser.cc \
- configuration.cc \
- exception.cc \
- log.cc
-test_configurationparser: $(TEST_CONFIGURATIONPARSER_FILES)
- @../../tools/test $(TEST_CONFIGURATIONPARSER_FILES) $(BASICFLAGS)
-
-TEST_EXCEPTION_FILES = \
- exception.cc \
- log.cc
-test_exception: $(TEST_EXCEPTION_FILES)
- @../../tools/test $(TEST_EXCEPTION_FILES)
-
-TEST_TEMPLATEHEADERPARSER_FILES = \
- templateheaderparser.cc \
- $(PARSERFILES) \
- $(BASICFILES)
-test_templateheaderparser: $(TEST_TEMPLATEHEADERPARSER_FILES)
- @../../tools/test $(TEST_TEMPLATEHEADERPARSER_FILES) $(BASICFLAGS) $(PARSERFLAGS)
-
-TEST_MACROHEADERPARSER_FILES = \
- macroheaderparser.cc \
- $(PARSERFILES) \
- $(BASICFILES)
-test_macroheaderparser: $(TEST_MACROHEADERPARSER_FILES)
- @../../tools/test $(TEST_MACROHEADERPARSER_FILES) $(BASICFLAGS) $(PARSERFLAGS)
-
-TEST_TEMPLATELIST_FILES = \
- templatelist.cc \
- versionstr.cc \
- templateheaderparser.cc \
- $(PARSERFILES) \
- $(BASICFILES)
-test_templatelist: $(TEST_TEMPLATELIST_FILES)
- @../../tools/test $(TEST_TEMPLATELIST_FILES) $(PARSERFLAGS) $(BASICFLAGS)
-
-TEST_MACROLIST_FILES = \
- macrolist.cc \
- versionstr.cc \
- macroheaderparser.cc \
- $(PARSERFILES) \
- $(BASICFILES)
-test_macrolist: $(TEST_MACROLIST_FILES)
- @../../tools/test $(TEST_MACROLIST_FILES) $(PARSERFLAGS) $(BASICFLAGS)
-
-TEST_SAXPARSER_FILES = \
- saxparser.cc \
- $(BASICFILES)
-test_saxparser: $(TEST_SAXPARSER_FILES)
- @../../tools/test $(TEST_SAXPARSER_FILES) $(BASICFLAGS) $(PARSERFLAGS)
-
-TEST_TRANSACTIONPARSER_FILES = \
- transactionparser.cc \
- $(BASICFILES) \
- $(PARSERFILES)
-test_transactionparser: $(TEST_TRANSACTIONPARSER_FILES)
- @../../tools/test $(TEST_TRANSACTIONPARSER_FILES) $(BASICFLAGS) $(PARSERFLAGS)
-
-TEST_VERSIONSTR_FILES = \
- versionstr.cc \
- $(BASICFILES)
-test_versionstr: $(TEST_VERSIONSTR_FILES)
- @../../tools/test $(TEST_VERSIONSTR_FILES) $(BASICFLAGS)
-
-TEST_QUERYHANDLERPENTOMINOS_FILES = \
- queryhandlerpentominos.cc \
- tcpsocket.cc \
- $(PARSERFILES) \
- $(BASICFILES)
-test_queryhandlerpentominos: $(TEST_QUERYHANDLERPENTOMINOS_FILES)
- @../../tools/test $(TEST_QUERYHANDLERPENTOMINOS_FILES) $(PARSERFLAGS) $(BASICFLAGS) $(ATF_CFLAGS) $(ATF_LIBS)
+TEST_SOURCE_DEPS = ${pracrod_SOURCES} ${macrotool_SOURCES} \
+ ${EXTRA_DIST}
+TEST_SCRIPT_DIR = $(top_srcdir)/../tools
-TEST_QUERYHANDLERPRACRO_FILES = \
- queryhandlerpracro.cc \
- tcpsocket.cc \
- $(DBFILES) \
- $(PARSERFILES) \
- $(BASICFILES)
-test_queryhandlerpracro: $(TEST_QUERYHANDLERPRACRO_FILES)
- @../../tools/test $(TEST_QUERYHANDLERPRACRO_FILES) $(DBFLAGS) $(PARSERFLAGS) $(BASICFLAGS)
-
-TEST_LUAQUERMAPPER_FILES = \
- luaquerymapper.cc \
- $(BASICFILES)
-test_luaquerymapper: $(TEST_LUAQUERMAPPER_FILES)
- @../../tools/test $(TEST_LUAQUERMAPPER_FILES) $(LUA_LIBS) $(BASICFLAGS)
-
-TEST_TEMPLATEPARSER_FILES = \
- templateparser.cc \
- $(PARSERFILES) \
- $(BASICFILES)
-test_templateparser: $(TEST_TEMPLATEPARSER_FILES)
- @../../tools/test $(TEST_TEMPLATEPARSER_FILES) $(BASICFLAGS) $(PARSERFLAGS)
-
-TEST_MACROPARSER_FILES = \
- macroparser.cc \
- $(PARSERFILES) \
- $(BASICFILES)
-test_macroparser: $(TEST_MACROPARSER_FILES)
- @../../tools/test $(TEST_MACROPARSER_FILES) $(BASICFLAGS) $(PARSERFLAGS)
-
-TEST_SERVER_FILES = \
- server.cc \
- templateparser.cc \
- templatelist.cc \
- templateheaderparser.cc \
- queryhandlerpentominos.cc \
- journal_commit.cc \
- macrolist.cc \
- queryhandlerpracro.cc \
- macroheaderparser.cc \
- versionstr.cc \
- resumeparser.cc \
- luaquerymapper.cc \
- tcpsocket.cc \
- transactionparser.cc \
- widgetgenerator.cc \
- database.cc \
- pracrodao.cc \
- pracrodaotest.cc \
- pracrodaopgsql.cc \
- luaresume.cc \
- macroparser.cc \
- mutex.cc \
- xml_encode_decode.cc \
- $(PARSERFILES) \
- $(BASICFILES)
-test_server: $(TEST_SERVER_FILES)
- @../../tools/test $(TEST_SERVER_FILES) $(BASICFLAGS) $(LUA_LIBS) $(DBFLAGS) $(PARSERFLAGS) $(HTTPD_LIBS) $(HTTPD_CFLAGS)
-
-TEST_PRACRODAOPGSQL_FILES = \
- pracrodaopgsql.cc \
- pracrodao.cc \
- $(BASICFILES)
-test_pracrodaopgsql: $(TEST_PRACRODAOPGSQL_FILES)
- @../../tools/test $(TEST_PRACRODAOPGSQL_FILES) $(DBFLAGS) $(BASICFLAGS)
-
-TEST_XMLENCODEDECODE_FILES = \
- xml_encode_decode.cc
-test_xml_encode_decode: $(TEST_XMLENCODEDECODE_FILES)
- @../../tools/test $(TEST_XMLENCODEDECODE_FILES)
-
-TEST_JOURNALCOMMIT_FILES = \
- journal_commit.cc \
- templateparser.cc \
- $(PARSERFILES) \
- $(BASICFILES)
-test_journal_commit: $(TEST_JOURNALCOMMIT_FILES)
- @../../tools/test $(TEST_JOURNALCOMMIT_FILES) $(PARSERFLAGS) $(BASICFLAGS)
+include ${TEST_SCRIPT_DIR}/Makefile.am.test
-CLEANFILES = $(TESTFILES) $(TESTLOGS) *~
+include Makefile.am.test \ No newline at end of file