-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