From 822b054ab20791370fc857e74fc81e4c05031285 Mon Sep 17 00:00:00 2001 From: deva Date: Thu, 17 Dec 2009 13:34:55 +0000 Subject: Script rearrangement + autogen hack (very ugly) to fix test bootstrap problem. --- server/autogen.sh | 2 +- server/src/Makefile.am | 16 ++-------------- 2 files changed, 3 insertions(+), 15 deletions(-) (limited to 'server') diff --git a/server/autogen.sh b/server/autogen.sh index 45ef969..8294559 100755 --- a/server/autogen.sh +++ b/server/autogen.sh @@ -62,7 +62,7 @@ aclocalinclude="$ACLOCAL_FLAGS"; \ autoheader; \ echo "done.") && \ (echo $_echo_n " + Running automake: $_echo_c"; \ - automake --gnu --add-missing --copy; \ + touch src/tests.make; automake --gnu --add-missing --copy; rm src/tests.make;\ echo "done.") && \ (echo $_echo_n " + Running autoconf: $_echo_c"; \ autoconf; \ diff --git a/server/src/Makefile.am b/server/src/Makefile.am index d3745f7..8f24e07 100644 --- a/server/src/Makefile.am +++ b/server/src/Makefile.am @@ -117,18 +117,6 @@ EXTRA_DIST = \ # Test Section # ################ -tests.make: ${pracrod_SOURCES} ${EXTRA_DIST} - ../../tools/testlist > tests.make - @touch Makefile.am +include $(top_srcdir)/../tools/Makefile.am.test -include tests.make - -test: tests.make $(TESTFILES) - @echo "All tests done." - -test_clean: - rm -f $(TESTFILES) $(TESTLOGS) - -TESTLOGS = `for F in ${TESTFILES}; do echo $$F.log; done` - -CLEANFILES = $(TESTFILES) $(TESTLOGS) tests.make *~ +include Makefile.am.test \ No newline at end of file -- cgit v1.2.3