X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=tests%2FMakefile.am;h=aacfc6e4a5fb694e97fdfa53b60c9da451e2d531;hb=0c5e51127206d26290a8e1e1349ab37d847d1d84;hp=32c81c0b223838abf7699a5541f899d99600c066;hpb=b64abc3eac8a01faf1f217b02658826b523da977;p=projects%2Fchimara%2Fchimara.git

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 32c81c0..aacfc6e 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,40 +1,68 @@
 AM_CFLAGS = -Wall
 AM_CPPFLAGS = -I$(top_srcdir)
 
-dist_data_DATA = chimara.ui chimara.menus glulxercise.ui
+# 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)
 
-noinst_PROGRAMS = test-chimara test-multisession glulxercise
-
-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-close csstest
 
 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
 
-pkglib_LTLIBRARIES = first.la model.la gridtest.la splittest.la multiwin.la
-PLUGIN_LIBTOOL_FLAGS=-module -avoid-version -export-symbols-regex "^glk_main$$"
+plugin_loader_SOURCES = plugin-loader.c
+plugin_loader_CFLAGS = @TEST_CFLAGS@ $(AM_CFLAGS)
+plugin_loader_LDADD = @TEST_LIBS@ $(top_builddir)/libchimara/libchimara.la
+
+test_close_SOURCES = test-close.c
+test_close_CFLAGS = @TEST_CFLAGS@ $(AM_CFLAGS)
+test_close_LDADD = @TEST_LIBS@ $(top_builddir)/libchimara/libchimara.la
+
+csstest_SOURCES = csstest.c
+csstest_CFLAGS = @TEST_CFLAGS@ $(AM_CFLAGS)
+csstest_LDADD = @TEST_LIBS@ $(top_builddir)/libchimara/libchimara.la
+
+noinst_LTLIBRARIES = first.la model.la gridtest.la splittest.la multiwin.la \
+	styletest.la soundtest.la test-userstyle.la fileio.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 = $(TEST_PLUGIN_LIBTOOL_FLAGS)
+
+test_userstyle_la_SOURCES = test-userstyle.c
+test_userstyle_la_LDFLAGS = $(TEST_PLUGIN_LIBTOOL_FLAGS)
+
+soundtest_la_SOURCES = soundtest.c
+soundtest_la_LDFLAGS = $(TEST_PLUGIN_LIBTOOL_FLAGS)
+
+fileio_la_SOURCES = fileio.c
+fileio_la_CFLAGS = @TEST_CFLAGS@ $(AM_CFLAGS)
+fileio_la_LDFLAGS = $(TEST_PLUGIN_LIBTOOL_FLAGS)
+
+
+-include $(top_srcdir)/git.mk