Index: trunk/psModules/test/Makefile.am
===================================================================
--- trunk/psModules/test/Makefile.am	(revision 5067)
+++ trunk/psModules/test/Makefile.am	(revision 5169)
@@ -1,38 +1,14 @@
 # Makefile for psModule tests
 
-AM_LDFLAGS = $(top_builddir)/src/libpsmodule.la $(PSMODULE_LIBS)
-AM_CFLAGS  = @AM_CFLAGS@ -I$(top_srcdir)/src $(PSMODULE_CFLAGS)
+SUBDIRS = $(SRCDIRS)
 
-TESTS = tst_pmFlatField \
-	tst_pmMaskBadPixels \
-	tst_pmNonLinear \
-	tst_pmSubtractBias \
-	tst_pmReadoutCombine \
-	tst_pmSubtractSky \
-	tst_pmImageSubtract \
-	tst_pmImageCombine \
-	tst_pmObjects01 \
-	tst_pmAstrometry
+EXTRA_DIST = runTest FullUnitTest
 
-check_PROGRAMS = $(TESTS)
+all:
+	chmod a+x FullUnitTest
 
-TESTS_ENVIRONMENT = perl $(top_srcdir)/test/runTest --verified=$(srcdir)/verified
+test: check
 
 tests: $(TESTS)
 
-EXTRA_DIST = runTest verified
-
-CLEANFILES = $(TESTS) temp/*
-
-tst_pmFlatField_SOURCES = tst_pmFlatField.c
-tst_pmMaskBadPixels_SOURCES = tst_pmMaskBadPixels.c
-tst_pmNonLinear_SOURCES = tst_pmNonLinear.c
-tst_pmSubtractBias_SOURCES = tst_pmSubtractBias.c
-tst_pmReadoutCombine_SOURCES = tst_pmReadoutCombine.c
-tst_pmSubtractSky_SOURCES = tst_pmSubtractSky.c
-tst_pmImageSubtract_SOURCES = tst_pmImageSubtract.c
-tst_pmImageCombine_SOURCES = tst_pmImageCombine.c
-tst_pmObjects01_SOURCES = tst_pmObjects01.c
-tst_pmAstrometry_SOURCES = tst_pmAstrometry.c
-
-test: check
+CLEANFILES = $(TESTS)