Cleaned up the build system. 'make clean' now deletes the installed
authorMarkus Kauppila <markus.kauppila@gmail.com>
Fri, 01 Jul 2011 22:15:23 +0300
changeset 5736 1008297b86e1
parent 5735 9c13e2cef98d
child 5737 303be71c64aa
Cleaned up the build system. 'make clean' now deletes the installed test suites (this should prevent old tests lingering around)
test/test-automation/Makefile.am
test/test-automation/build-scripts/install-tests.sh
test/test-automation/install-tests.sh
test/test-automation/testdummy/Makefile.am
test/test-automation/testplatform/Makefile.am
test/test-automation/testplatform/Makefile.in
test/test-automation/testrect/Makefile.am
--- a/test/test-automation/Makefile.am	Fri Jul 01 18:21:11 2011 +0300
+++ b/test/test-automation/Makefile.am	Fri Jul 01 22:15:23 2011 +0300
@@ -9,8 +9,8 @@
 
 install: install-tests
 install-tests:
-	$(SHELL) install-tests.sh
+	$(SHELL) build-scripts/install-tests.sh
 
-distclean-local:
+clean-local:
 	-rm -Rf tests/ docs/
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/test-automation/build-scripts/install-tests.sh	Fri Jul 01 22:15:23 2011 +0300
@@ -0,0 +1,24 @@
+#! /bin/bash
+
+DIRECTORY="tests"
+EXT="error"
+
+#echo "Installing test suites to $DIRECTORY" 
+
+rm -Rfv $DIRECTORY > /dev/null 2>&1
+mkdir $DIRECTORY > /dev/null 2>&1
+
+PLATFORM="$(uname)"
+if [[ $PLATFORM ==  "Linux" ]]; then
+	EXT="so"
+elif [[ $PLATFORM ==  "Darwin" ]]; then
+	EXT="dylib"
+fi
+
+# TODO: put the test in an array
+for suite in "testdummy" "testplatform" "testrect"
+do
+	cp -f "$suite/.libs/lib$suite.$EXT" $DIRECTORY
+done
+
+echo "Test suites installed."
--- a/test/test-automation/install-tests.sh	Fri Jul 01 18:21:11 2011 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-#! /bin/bash
-
-DIRECTORY="tests"
-EXT="error"
-
-echo "Installing test suites to $DIRECTORY" 
-
-rm -Rfv $DIRECTORY 2&>1 /dev/null
-mkdir $DIRECTORY 2&>1 /dev/null
-
-PLATFORM="$(uname)"
-if [[ $PLATFORM ==  "Linux" ]]; then
-	EXT="so"
-elif [[ $PLATFORM ==  "Darwin" ]]; then
-	EXT="dylib"
-fi
-
-# TODO: put the test in an array
-for suite in "testdummy" "testplatform" "testrect"
-do
-	cp -f "$suite/.libs/lib$suite.$EXT" $DIRECTORY
-done
-
-echo "Test suited installed."
--- a/test/test-automation/testdummy/Makefile.am	Fri Jul 01 18:21:11 2011 +0300
+++ b/test/test-automation/testdummy/Makefile.am	Fri Jul 01 22:15:23 2011 +0300
@@ -2,8 +2,3 @@
 libtestdummy_la_SOURCES = testdummy.c ../SDL_test.c ../logger.c ../logger_helpers.c ../plain_logger.c ../xml_logger.c ../xml.c
 libtestdummy_la_CLAGS = -fPIC -g
 libtestdummy_la_LDFLAGS = `sdl-config --libs`
-
-distclean-local:
-	-rm *.dylib
-	-rm *.so
-
--- a/test/test-automation/testplatform/Makefile.am	Fri Jul 01 18:21:11 2011 +0300
+++ b/test/test-automation/testplatform/Makefile.am	Fri Jul 01 22:15:23 2011 +0300
@@ -2,8 +2,3 @@
 libtestplatform_la_SOURCES = testplatform.c ../SDL_test.c ../logger.c ../logger_helpers.c ../plain_logger.c ../xml_logger.c ../xml.c
 libtestplatform_la_CLAGS = -fPIC -g
 libtestplatform_la_LDFLAGS = `sdl-config --libs`
-
-distclean-local:
-	-rm *.dylib
-	-rm *.so
-
--- a/test/test-automation/testplatform/Makefile.in	Fri Jul 01 18:21:11 2011 +0300
+++ b/test/test-automation/testplatform/Makefile.in	Fri Jul 01 22:15:23 2011 +0300
@@ -486,7 +486,7 @@
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-local distclean-tags
+	distclean-tags
 
 dvi: dvi-am
 
@@ -553,10 +553,10 @@
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libLTLIBRARIES clean-libtool ctags distclean \
 	distclean-compile distclean-generic distclean-libtool \
-	distclean-local distclean-tags distdir dvi dvi-am html html-am \
-	info info-am install install-am install-data install-data-am \
-	install-dvi install-dvi-am install-exec install-exec-am \
-	install-html install-html-am install-info install-info-am \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am \
 	install-libLTLIBRARIES install-man install-pdf install-pdf-am \
 	install-ps install-ps-am install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
@@ -565,10 +565,6 @@
 	tags uninstall uninstall-am uninstall-libLTLIBRARIES
 
 
-distclean-local:
-	-rm *.dylib
-	-rm *.so
-
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
--- a/test/test-automation/testrect/Makefile.am	Fri Jul 01 18:21:11 2011 +0300
+++ b/test/test-automation/testrect/Makefile.am	Fri Jul 01 22:15:23 2011 +0300
@@ -2,8 +2,3 @@
 libtestrect_la_SOURCES = testrect.c ../SDL_test.c ../logger.c ../logger_helpers.c ../plain_logger.c ../xml_logger.c ../xml.c
 libtestrect_la_CLAGS = -fPIC -g
 libtestrect_la_LDFLAGS = `sdl-config --libs`
-
-distclean-local:
-	-rm *.dylib
-	-rm *.so
-