Fixed linking issue concerning test suites.

Fixed linux build (it compiles and runs properly).
libsdl-org · Jul 20, 2011 · 24ca1fd · 24ca1fd
1 parent 9a121a3
commit 24ca1fd
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 13 deletions.
diff --git a/test/test-automation/Makefile.am b/test/test-automation/Makefile.am
@@ -14,6 +14,10 @@ libtest_la_SOURCES = SDL_test.c logger_helpers.c plain_logger.c xml_logger.c xml
 libtest_la_CLAGS = -fPIC -g
 libtest_la_LDFLAGS = `sdl-config --libs`
 
+libtest: libtest.la
+		echo "Test library compiled."
+
+all-local: install-tests
 install: install-tests
 install-tests:
 	$(SHELL) build-scripts/install-tests.sh

diff --git a/test/test-automation/configure.ac b/test/test-automation/configure.ac
@@ -44,4 +44,4 @@ echo ""
 echo "========================================"
 echo ""
 echo "./configure ready!"
-echo "you're ready to run: 'make && make install'"
+echo "you're ready to run: 'make libtest && make'"
diff --git a/test/test-automation/testaudio/Makefile.am b/test/test-automation/testaudio/Makefile.am
@@ -1,4 +1,4 @@
 lib_LTLIBRARIES = libtestaudio.la
-libtestaudio_la_SOURCES = testaudio.c ../SDL_test.c ../logger_helpers.c ../plain_logger.c ../xml_logger.c ../xml.c
+libtestaudio_la_SOURCES = testaudio.c
 libtestaudio_la_CLAGS = -fPIC -g
-libtestaudio_la_LDFLAGS = `sdl-config --libs`
+libtestaudio_la_LDFLAGS = `sdl-config --libs` -I ../.libs/libtest.la
diff --git a/test/test-automation/testdummy/Makefile.am b/test/test-automation/testdummy/Makefile.am
@@ -1,5 +1,4 @@
 lib_LTLIBRARIES = libtestdummy.la
 libtestdummy_la_SOURCES = testdummy.c 
 libtestdummy_la_CLAGS = -fPIC -g
-libtestdummy_la_LIBADD = ../libtest.la
-libtestdummy_la_LDFLAGS = `sdl-config --libs`
+libtestdummy_la_LDFLAGS = `sdl-config --libs` -I ../.libs/libtest.la
diff --git a/test/test-automation/testdummy/testdummy.c b/test/test-automation/testdummy/testdummy.c
@@ -95,7 +95,7 @@ void
 dummycase2(void *arg)
 {
 	char *msg = "eello";
-	msg[0] = 'H';
+	//msg[0] = 'H';
 	AssertTrue(1, "Assert message");
 }
 

diff --git a/test/test-automation/testplatform/Makefile.am b/test/test-automation/testplatform/Makefile.am
@@ -1,4 +1,4 @@
 lib_LTLIBRARIES = libtestplatform.la
-libtestplatform_la_SOURCES = testplatform.c ../SDL_test.c ../logger_helpers.c ../plain_logger.c ../xml_logger.c ../xml.c
+libtestplatform_la_SOURCES = testplatform.c
 libtestplatform_la_CLAGS = -fPIC -g
-libtestplatform_la_LDFLAGS = `sdl-config --libs`
+libtestplatform_la_LDFLAGS = `sdl-config --libs` -I ../.libs/libtest.la
diff --git a/test/test-automation/testrect/Makefile.am b/test/test-automation/testrect/Makefile.am
@@ -1,4 +1,4 @@
 lib_LTLIBRARIES = libtestrect.la
-libtestrect_la_SOURCES = testrect.c ../SDL_test.c ../logger_helpers.c ../plain_logger.c ../xml_logger.c ../xml.c
+libtestrect_la_SOURCES = testrect.c
 libtestrect_la_CLAGS = -fPIC -g
-libtestrect_la_LDFLAGS = `sdl-config --libs`
+libtestrect_la_LDFLAGS = `sdl-config --libs` -I ../.libs/libtest.la
diff --git a/test/test-automation/testsurface/Makefile.am b/test/test-automation/testsurface/Makefile.am
@@ -1,5 +1,4 @@
 lib_LTLIBRARIES = libtestsurface.la
-libtestsurface_la_SOURCES = testsurface.c ../SDL_test.c ../logger_helpers.c ../plain_logger.c ../xml_logger.c ../xml.c \
-	../common/common.c ../common/img_blit.c ../common/img_blitblend.c ../common/img_face.c ../common/img_primitives.c ../common/img_primitivesblend.c
+libtestsurface_la_SOURCES = testsurface.c
 libtestsurface_la_CLAGS = -fPIC -g
-libtestsurface_la_LDFLAGS = `sdl-config --libs`
+libtestsurface_la_LDFLAGS = `sdl-config --libs` -I ../.libs/libtest.la