Cleaned up the build system. 'make clean' now deletes the installed
authorMarkus Kauppila
Fri, 01 Jul 2011 22:15:23 +0300
changeset 57361008297b86e1
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
     1.1 --- a/test/test-automation/Makefile.am	Fri Jul 01 18:21:11 2011 +0300
     1.2 +++ b/test/test-automation/Makefile.am	Fri Jul 01 22:15:23 2011 +0300
     1.3 @@ -9,8 +9,8 @@
     1.4  
     1.5  install: install-tests
     1.6  install-tests:
     1.7 -	$(SHELL) install-tests.sh
     1.8 +	$(SHELL) build-scripts/install-tests.sh
     1.9  
    1.10 -distclean-local:
    1.11 +clean-local:
    1.12  	-rm -Rf tests/ docs/
    1.13  
     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/test/test-automation/build-scripts/install-tests.sh	Fri Jul 01 22:15:23 2011 +0300
     2.3 @@ -0,0 +1,24 @@
     2.4 +#! /bin/bash
     2.5 +
     2.6 +DIRECTORY="tests"
     2.7 +EXT="error"
     2.8 +
     2.9 +#echo "Installing test suites to $DIRECTORY" 
    2.10 +
    2.11 +rm -Rfv $DIRECTORY > /dev/null 2>&1
    2.12 +mkdir $DIRECTORY > /dev/null 2>&1
    2.13 +
    2.14 +PLATFORM="$(uname)"
    2.15 +if [[ $PLATFORM ==  "Linux" ]]; then
    2.16 +	EXT="so"
    2.17 +elif [[ $PLATFORM ==  "Darwin" ]]; then
    2.18 +	EXT="dylib"
    2.19 +fi
    2.20 +
    2.21 +# TODO: put the test in an array
    2.22 +for suite in "testdummy" "testplatform" "testrect"
    2.23 +do
    2.24 +	cp -f "$suite/.libs/lib$suite.$EXT" $DIRECTORY
    2.25 +done
    2.26 +
    2.27 +echo "Test suites installed."
     3.1 --- a/test/test-automation/install-tests.sh	Fri Jul 01 18:21:11 2011 +0300
     3.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.3 @@ -1,24 +0,0 @@
     3.4 -#! /bin/bash
     3.5 -
     3.6 -DIRECTORY="tests"
     3.7 -EXT="error"
     3.8 -
     3.9 -echo "Installing test suites to $DIRECTORY" 
    3.10 -
    3.11 -rm -Rfv $DIRECTORY 2&>1 /dev/null
    3.12 -mkdir $DIRECTORY 2&>1 /dev/null
    3.13 -
    3.14 -PLATFORM="$(uname)"
    3.15 -if [[ $PLATFORM ==  "Linux" ]]; then
    3.16 -	EXT="so"
    3.17 -elif [[ $PLATFORM ==  "Darwin" ]]; then
    3.18 -	EXT="dylib"
    3.19 -fi
    3.20 -
    3.21 -# TODO: put the test in an array
    3.22 -for suite in "testdummy" "testplatform" "testrect"
    3.23 -do
    3.24 -	cp -f "$suite/.libs/lib$suite.$EXT" $DIRECTORY
    3.25 -done
    3.26 -
    3.27 -echo "Test suited installed."
     4.1 --- a/test/test-automation/testdummy/Makefile.am	Fri Jul 01 18:21:11 2011 +0300
     4.2 +++ b/test/test-automation/testdummy/Makefile.am	Fri Jul 01 22:15:23 2011 +0300
     4.3 @@ -2,8 +2,3 @@
     4.4  libtestdummy_la_SOURCES = testdummy.c ../SDL_test.c ../logger.c ../logger_helpers.c ../plain_logger.c ../xml_logger.c ../xml.c
     4.5  libtestdummy_la_CLAGS = -fPIC -g
     4.6  libtestdummy_la_LDFLAGS = `sdl-config --libs`
     4.7 -
     4.8 -distclean-local:
     4.9 -	-rm *.dylib
    4.10 -	-rm *.so
    4.11 -
     5.1 --- a/test/test-automation/testplatform/Makefile.am	Fri Jul 01 18:21:11 2011 +0300
     5.2 +++ b/test/test-automation/testplatform/Makefile.am	Fri Jul 01 22:15:23 2011 +0300
     5.3 @@ -2,8 +2,3 @@
     5.4  libtestplatform_la_SOURCES = testplatform.c ../SDL_test.c ../logger.c ../logger_helpers.c ../plain_logger.c ../xml_logger.c ../xml.c
     5.5  libtestplatform_la_CLAGS = -fPIC -g
     5.6  libtestplatform_la_LDFLAGS = `sdl-config --libs`
     5.7 -
     5.8 -distclean-local:
     5.9 -	-rm *.dylib
    5.10 -	-rm *.so
    5.11 -
     6.1 --- a/test/test-automation/testplatform/Makefile.in	Fri Jul 01 18:21:11 2011 +0300
     6.2 +++ b/test/test-automation/testplatform/Makefile.in	Fri Jul 01 22:15:23 2011 +0300
     6.3 @@ -486,7 +486,7 @@
     6.4  	-rm -rf ./$(DEPDIR)
     6.5  	-rm -f Makefile
     6.6  distclean-am: clean-am distclean-compile distclean-generic \
     6.7 -	distclean-local distclean-tags
     6.8 +	distclean-tags
     6.9  
    6.10  dvi: dvi-am
    6.11  
    6.12 @@ -553,10 +553,10 @@
    6.13  .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
    6.14  	clean-libLTLIBRARIES clean-libtool ctags distclean \
    6.15  	distclean-compile distclean-generic distclean-libtool \
    6.16 -	distclean-local distclean-tags distdir dvi dvi-am html html-am \
    6.17 -	info info-am install install-am install-data install-data-am \
    6.18 -	install-dvi install-dvi-am install-exec install-exec-am \
    6.19 -	install-html install-html-am install-info install-info-am \
    6.20 +	distclean-tags distdir dvi dvi-am html html-am info info-am \
    6.21 +	install install-am install-data install-data-am install-dvi \
    6.22 +	install-dvi-am install-exec install-exec-am install-html \
    6.23 +	install-html-am install-info install-info-am \
    6.24  	install-libLTLIBRARIES install-man install-pdf install-pdf-am \
    6.25  	install-ps install-ps-am install-strip installcheck \
    6.26  	installcheck-am installdirs maintainer-clean \
    6.27 @@ -565,10 +565,6 @@
    6.28  	tags uninstall uninstall-am uninstall-libLTLIBRARIES
    6.29  
    6.30  
    6.31 -distclean-local:
    6.32 -	-rm *.dylib
    6.33 -	-rm *.so
    6.34 -
    6.35  # Tell versions [3.59,3.63) of GNU make to not export all variables.
    6.36  # Otherwise a system limit (for SysV at least) may be exceeded.
    6.37  .NOEXPORT:
     7.1 --- a/test/test-automation/testrect/Makefile.am	Fri Jul 01 18:21:11 2011 +0300
     7.2 +++ b/test/test-automation/testrect/Makefile.am	Fri Jul 01 22:15:23 2011 +0300
     7.3 @@ -2,8 +2,3 @@
     7.4  libtestrect_la_SOURCES = testrect.c ../SDL_test.c ../logger.c ../logger_helpers.c ../plain_logger.c ../xml_logger.c ../xml.c
     7.5  libtestrect_la_CLAGS = -fPIC -g
     7.6  libtestrect_la_LDFLAGS = `sdl-config --libs`
     7.7 -
     7.8 -distclean-local:
     7.9 -	-rm *.dylib
    7.10 -	-rm *.so
    7.11 -