From 51d6f10f01b97ac6d2feff602999dc09d305880c Mon Sep 17 00:00:00 2001 From: Markus Kauppila Date: Wed, 20 Jul 2011 19:57:42 +0300 Subject: [PATCH] Fixing linking issues using shared object. --- test/test-automation/Makefile.am | 9 ++++++++- test/test-automation/testdummy/Makefile.am | 3 ++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/test/test-automation/Makefile.am b/test/test-automation/Makefile.am index b76e3a186..c77ec1fbc 100644 --- a/test/test-automation/Makefile.am +++ b/test/test-automation/Makefile.am @@ -3,10 +3,17 @@ ACLOCAL_AMFLAGS = -I acinclude -I build-scripts SUBDIRS = testdummy testrect testplatform testaudio testsurface bin_PROGRAMS = runner -runner_SOURCES = runner.c SDL_test.c xml_logger.c plain_logger.c xml.c logger_helpers.c support.c +runner_SOURCES = runner.c support.c runner_CLAGS = -W -Wall -Wextra -g `sdl-config --cflags` -DSDL_NO_COMPAT +runner_LDADD = libtest.la runner_LDFLAGS = `sdl-config --libs` +lib_LTLIBRARIES = libtest.la +libtest_la_SOURCES = 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 +libtest_la_CLAGS = -fPIC -g +libtest_la_LDFLAGS = `sdl-config --libs` + install: install-tests install-tests: $(SHELL) build-scripts/install-tests.sh diff --git a/test/test-automation/testdummy/Makefile.am b/test/test-automation/testdummy/Makefile.am index afe805d23..a2734afea 100644 --- a/test/test-automation/testdummy/Makefile.am +++ b/test/test-automation/testdummy/Makefile.am @@ -1,4 +1,5 @@ lib_LTLIBRARIES = libtestdummy.la -libtestdummy_la_SOURCES = testdummy.c ../SDL_test.c ../logger_helpers.c ../plain_logger.c ../xml_logger.c ../xml.c +libtestdummy_la_SOURCES = testdummy.c libtestdummy_la_CLAGS = -fPIC -g +libtestdummy_la_LIBADD = ../libtest.la libtestdummy_la_LDFLAGS = `sdl-config --libs`