X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=tests%2FMakefile.am;h=f8909a5d8063f17bc728687080b4f32a3539a5a9;hb=ad091d02678a632f0f91f26072bbec29eba4c66e;hp=b915c48fd2ed2dce2b0a1b37990fb7790bbf4561;hpb=7a7da51ea1daba19a9f1b3e843272e9377e4d97b;p=projects%2Fchimara%2Fchimara.git

diff --git a/tests/Makefile.am b/tests/Makefile.am
index b915c48..f8909a5 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,3 +1,5 @@
+SUBDIRS = unit
+
 AM_CFLAGS = -Wall
 AM_CPPFLAGS = -I$(top_srcdir)
 
@@ -10,13 +12,13 @@ TEST_PLUGIN_LIBTOOL_FLAGS = \
 	-export-symbols-regex "^glk_main$$" \
 	-rpath $(abs_builddir)
 
-noinst_PROGRAMS = test-multisession glulxercise plugin-loader
+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_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
@@ -25,7 +27,16 @@ plugin_loader_SOURCES = plugin-loader.c
 plugin_loader_CFLAGS = @TEST_CFLAGS@ $(AM_CFLAGS)
 plugin_loader_LDADD = @TEST_LIBS@ $(top_builddir)/libchimara/libchimara.la
 
-noinst_LTLIBRARIES = first.la model.la gridtest.la splittest.la multiwin.la styletest.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 = $(TEST_PLUGIN_LIBTOOL_FLAGS)
@@ -44,3 +55,16 @@ 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