X-Git-Url: https://git.stderr.nl/gitweb?p=rodin%2Fchimara.git;a=blobdiff_plain;f=tests%2FMakefile.am;h=e4ed4d4c1b43642ed5bb44126e8a035ed086dbb7;hp=45e0acfa46b0bfe537bb9a9749baece2a1590c34;hb=1cf1a0b599423e4c8960f2021bceb90e85d4695c;hpb=13b21e2a9ba53c7109ae0bbfd774f16f0c9d4413

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 45e0acf..e4ed4d4 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,59 +1,46 @@
 AM_CFLAGS = -Wall
 AM_CPPFLAGS = -I$(top_srcdir)
 
-PLUGIN_LIBTOOL_FLAGS=-module -avoid-version -export-symbols-regex "^glk_main$$"
+# The rpath is necessary because stoopid libtool won't build a shared library
+# if it's noinst_, because what POSSIBLE reason could you have to do that?
+TEST_PLUGIN_LIBTOOL_FLAGS = \
+	-module \
+	-shared \
+	-avoid-version \
+	-export-symbols-regex "^glk_main$$" \
+	-rpath $(abs_builddir)
 
-if TARGET_ILIAD
-
-iliad_SOURCES = iliad.c
-iliad_CFLAGS = @TEST_CFLAGS@ $(AM_CFLAGS)
-iliad_LDADD = @TEST_LIBS@ $(top_builddir)/libchimara/libchimara.la
-
-noinst_PROGRAMS = iliad
-
-else
-
-dist_data_DATA = chimara.ui chimara.menus glulxercise.ui
-noinst_PROGRAMS = test-chimara test-multisession glulxercise plugin-loader
-
-test_chimara_SOURCES = main.c callbacks.c error.c error.h
-test_chimara_CPPFLAGS = $(AM_CPPFLAGS) \
-	-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
-	-DPACKAGE_SRC_DIR=\""$(srcdir)"\" \
-	-DPACKAGE_DATA_DIR=\""$(datadir)"\"
-test_chimara_CFLAGS = @TEST_CFLAGS@ $(AM_CFLAGS)
-test_chimara_LDADD = @TEST_LIBS@ $(top_builddir)/libchimara/libchimara.la
+noinst_PROGRAMS = test-multisession glulxercise plugin-loader
 
 test_multisession_SOURCES = test-multisession.c
 test_multisession_CFLAGS = @TEST_CFLAGS@ $(AM_CFLAGS)
 test_multisession_LDADD = @TEST_LIBS@ $(top_builddir)/libchimara/libchimara.la
 
-glulxercise_SOURCES = glulxercise.c error.c error.h
-glulxercise_CFLAGS = @TEST_CFLAGS@ $(AM_CFLAGS)
+glulxercise_SOURCES = glulxercise.c
+glulxercise_CPPFLAGS = $(AM_CPPFLAGS) -DPACKAGE_SRC_DIR=\""$(srcdir)"\"
+glulxercise_CFLAGS = @TEST_CFLAGS@ $(AM_CFLAGS) 
 glulxercise_LDADD = @TEST_LIBS@ $(top_builddir)/libchimara/libchimara.la
 
 plugin_loader_SOURCES = plugin-loader.c
 plugin_loader_CFLAGS = @TEST_CFLAGS@ $(AM_CFLAGS)
 plugin_loader_LDADD = @TEST_LIBS@ $(top_builddir)/libchimara/libchimara.la
 
-pkglib_LTLIBRARIES = first.la model.la gridtest.la splittest.la multiwin.la styletest.la
+noinst_LTLIBRARIES = first.la model.la gridtest.la splittest.la multiwin.la styletest.la
 
 first_la_SOURCES = first.c
-first_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
+first_la_LDFLAGS = $(TEST_PLUGIN_LIBTOOL_FLAGS)
 
 model_la_SOURCES = model.c
-model_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
+model_la_LDFLAGS = $(TEST_PLUGIN_LIBTOOL_FLAGS)
 
 gridtest_la_SOURCES = gridtest.c
-gridtest_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
+gridtest_la_LDFLAGS = $(TEST_PLUGIN_LIBTOOL_FLAGS)
 
 splittest_la_SOURCES = splittest.c
-splittest_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
+splittest_la_LDFLAGS = $(TEST_PLUGIN_LIBTOOL_FLAGS)
 
 multiwin_la_SOURCES = multiwin.c
-multiwin_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
+multiwin_la_LDFLAGS = $(TEST_PLUGIN_LIBTOOL_FLAGS)
 
 styletest_la_SOURCES = styletest.c
-styletest_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
-
-endif
+styletest_la_LDFLAGS = $(TEST_PLUGIN_LIBTOOL_FLAGS)