Cleaned up the build system. 'make clean' now deletes the installed

test suites (this should prevent old tests lingering around)
libsdl-org · Jul 1, 2011 · 098bb13 · 098bb13
1 parent 1c74695
commit 098bb13
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 30 deletions.
diff --git a/test/test-automation/Makefile.am b/test/test-automation/Makefile.am
@@ -9,8 +9,8 @@ runner_LDFLAGS = `sdl-config --libs`
 
 install: install-tests
 install-tests:
-	$(SHELL) install-tests.sh
+	$(SHELL) build-scripts/install-tests.sh
 
-distclean-local:
+clean-local:
 	-rm -Rf tests/ docs/
 
diff --git a/test/test-automation/install-tests.sh → ...automation/build-scripts/install-tests.sh b/test/test-automation/install-tests.sh → ...automation/build-scripts/install-tests.sh
@@ -3,10 +3,10 @@
 DIRECTORY="tests"
 EXT="error"
 
-echo "Installing test suites to $DIRECTORY" 
+#echo "Installing test suites to $DIRECTORY" 
 
-rm -Rfv $DIRECTORY 2&>1 /dev/null
-mkdir $DIRECTORY 2&>1 /dev/null
+rm -Rfv $DIRECTORY > /dev/null 2>&1
+mkdir $DIRECTORY > /dev/null 2>&1
 
 PLATFORM="$(uname)"
 if [[ $PLATFORM ==  "Linux" ]]; then
@@ -21,4 +21,4 @@ do
 	cp -f "$suite/.libs/lib$suite.$EXT" $DIRECTORY
 done
 
-echo "Test suited installed."
+echo "Test suites installed."
diff --git a/test/test-automation/testdummy/Makefile.am b/test/test-automation/testdummy/Makefile.am
@@ -2,8 +2,3 @@ lib_LTLIBRARIES = libtestdummy.la
 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
-
diff --git a/test/test-automation/testplatform/Makefile.am b/test/test-automation/testplatform/Makefile.am
@@ -2,8 +2,3 @@ lib_LTLIBRARIES = libtestplatform.la
 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
-
diff --git a/test/test-automation/testplatform/Makefile.in b/test/test-automation/testplatform/Makefile.in
@@ -486,7 +486,7 @@ distclean: distclean-am
 	-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 @@ uninstall-am: uninstall-libLTLIBRARIES
 .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 @@ uninstall-am: uninstall-libLTLIBRARIES
 	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:
diff --git a/test/test-automation/testrect/Makefile.am b/test/test-automation/testrect/Makefile.am
@@ -2,8 +2,3 @@ lib_LTLIBRARIES = libtestrect.la
 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
-