Index: trunk/psLib/test/sys/Makefile.am
===================================================================
--- trunk/psLib/test/sys/Makefile.am	(revision 7998)
+++ trunk/psLib/test/sys/Makefile.am	(revision 8718)
@@ -1,42 +1,13 @@
-#Makefile for sys tests
-#
-AM_CPPFLAGS = $(SRCINC) $(PSLIB_CFLAGS)
-AM_LDFLAGS = $(top_builddir)/src/libpslib.la $(PSLIB_LIBS)
+AM_CPPFLAGS = $(SRCINC) -I$(top_srcdir)/test/tap/src $(PSLIB_CFLAGS)
+AM_LDFLAGS = \
+	$(top_builddir)/src/libpslib.la  \
+	$(top_builddir)/test/tap/src/libtap.la \
+	$(PSLIB_LIBS)
 
-TESTS = \
-	tst_psAbort \
-	tst_psConfigure \
-	tst_psError \
-	tst_psLogMsg \
-	tst_psMemory \
-	tst_psString \
-	tst_psTrace \
-	tap_psStringSubstitute \
-	tst_psLine
+check_PROGRAMS = \
+	tap_psStringSubstitute
 
-tst_psAbort_SOURCES =  tst_psAbort.c
-tst_psConfigure_SOURCES =  tst_psConfigure.c
-tst_psError_SOURCES =  tst_psError.c
-tst_psLogMsg_SOURCES =  tst_psLogMsg.c
-tst_psMemory_SOURCES =  tst_psMemory.c
-tst_psString_SOURCES =  tst_psString.c
-tst_psTrace_SOURCES =  tst_psTrace.c
-tst_psLine_SOURCES =  tst_psLine.c
-
-tap_psStringSubstitute_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/test/tap/src
-tap_psStringSubstitute_LDFLAGS 	= $(AM_LDFLAGS) $(top_builddir)/test/tap/src/libtap.la
-
-check_DATA =
-
-check_PROGRAMS = $(TESTS)
-
-TESTS_ENVIRONMENT = perl $(top_srcdir)/test/runTest -verified=$(srcdir)/verified
-
-EXTRA_DIST = verified
-
-CLEANFILES = $(TESTS) $(check_DATA) temp/* log.txt log2.txt test.fits tst_psTrace02_OUT \
+CLEANFILES = $(check_DATA) temp/* log.txt log2.txt test.fits tst_psTrace02_OUT \
 	core core.* *~ *.bb *.bbg *.da gmon.out
 
-tests: $(check_DATA) $(TESTS)
-
 test: check