summaryrefslogtreecommitdiff
path: root/server/src/Makefile.am
diff options
context:
space:
mode:
Diffstat (limited to 'server/src/Makefile.am')
-rw-r--r--server/src/Makefile.am19
1 files changed, 14 insertions, 5 deletions
diff --git a/server/src/Makefile.am b/server/src/Makefile.am
index 668ca0c..4196ab9 100644
--- a/server/src/Makefile.am
+++ b/server/src/Makefile.am
@@ -1,9 +1,13 @@
bin_PROGRAMS = pracrod macrotool
-pracrod_LDADD = $(LD_EFENCE) $(PQXX_LIBS) $(CONFIG_LIBS) $(LUA_LIBS) $(HTTPD_LIBS) -lpthread
+pracrod_LDADD = $(LD_EFENCE) $(PQXX_LIBS) $(CONFIG_LIBS) \
+ $(LUA_LIBS) $(HTTPD_LIBS) $(PTHREAD_LIBS) \
+ $(EXPAT_LIBS)
-pracrod_CXXFLAGS = $(PQXX_CXXFLAGS) $(CONFIG_CXXFLAGS) $(LUA_CXXFLAGS) $(HTTPD_CFLAGS)
+pracrod_CXXFLAGS = $(PQXX_CXXFLAGS) $(CONFIG_CXXFLAGS) \
+ $(LUA_CXXFLAGS) $(HTTPD_CFLAGS) $(EXPAT_CFLAGS) \
+ $(PTHREAD_CFLAGS)
pracrod_SOURCES = \
pracrod.cc \
@@ -49,9 +53,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 \
@@ -131,6 +137,9 @@ EXTRA_DIST = \
# Test Section #
################
-include $(top_srcdir)/../tools/Makefile.am.test
+TEST_SOURCE_DEPS=${pracrodt_SOURCES} ${macrotool_SOURCES} ${EXTRA_DIST}
+TEST_SCRIPT_DIR=$(top_srcdir)/../tools
+
+include ${TEST_SCRIPT_DIR}/Makefile.am.test
include Makefile.am.test \ No newline at end of file