From 26c4f370344ae35029d123b83ff3c53dda8e1947 Mon Sep 17 00:00:00 2001
From: deva <deva>
Date: Mon, 18 Jan 2010 08:39:22 +0000
Subject: Backported testscript changes from Pentominos

---
 server/src/Makefile.am | 19 ++++++++++++++-----
 tools/Makefile.am.test |  4 ++--
 tools/testlist         |  4 +++-
 3 files changed, 19 insertions(+), 8 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
diff --git a/tools/Makefile.am.test b/tools/Makefile.am.test
index 70382b0..5c5e8c7 100644
--- a/tools/Makefile.am.test
+++ b/tools/Makefile.am.test
@@ -1,5 +1,5 @@
-Makefile.am.test: ${pracrod_SOURCES} ${EXTRA_DIST}
-	$(top_srcdir)/../tools/testlist > Makefile.am.test
+Makefile.am.test: ${TEST_SOURCE_DEPS}
+	${TEST_SCRIPT_DIR}/testlist > Makefile.am.test
 	@touch Makefile.am	
 
 test: Makefile.am.test $(TESTFILES)
diff --git a/tools/testlist b/tools/testlist
index fca9d95..a4e7202 100755
--- a/tools/testlist
+++ b/tools/testlist
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+SCRIPTDIR=`dirname $0`
+
 grep "TEST_BEGIN" *.cc > tmp
 
 echo -n "TESTFILES="
@@ -22,7 +24,7 @@ do
 		CFLAGS=`cat $FILE | grep "cflags:" | cut -d':' -f2`
 		TEST=test_$NAME
 		echo "$TEST: $FILE $DEPS"
-		echo -e "\t@../../tools/test $FILE $DEPS $CFLAGS $LIBS"
+		echo -e "\t@${SCRIPTDIR}/test $FILE $DEPS $CFLAGS $LIBS"
 		echo ""
 done < tmp
 
-- 
cgit v1.2.3