-pkglib_LTLIBRARIES = first.la model.la gridtest.la splittest.la multiwin.la
-PLUGIN_LIBTOOL_FLAGS=-module -avoid-version -export-symbols-regex "^glk_main$$"
+glulxercise_SOURCES = glulxercise.c error.c error.h
+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