Index: trunk/psLib/test/imageops/Makefile.am
===================================================================
--- trunk/psLib/test/imageops/Makefile.am	(revision 7998)
+++ trunk/psLib/test/imageops/Makefile.am	(revision 8718)
@@ -1,40 +1,12 @@
-#Makefile for imageops tests of psLib
-#
-AM_CPPFLAGS = $(SRCINC) $(PSLIB_CFLAGS) -DVERIFIED_DIR=\"$(srcdir)/verified\"
-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_psImageConvolve \
-	tst_psImageGeomManip \
-	tst_psImageInterpolate \
-	tst_psImagePixelExtract \
-	tst_psImagePixelManip \
-	tst_psImageStats \
-	tst_psImageStructManip \
-	tst_psImageSmooth \
-    tst_psImageMaskOps
+check_PROGRAMS =
 
-tst_psImageConvolve_SOURCES =  tst_psImageConvolve.c
-tst_psImageGeomManip_SOURCES =  tst_psImageGeomManip.c
-tst_psImageInterpolate_SOURCES =  tst_psImageInterpolate.c
-tst_psImagePixelExtract_SOURCES =  tst_psImagePixelExtract.c
-tst_psImagePixelManip_SOURCES =  tst_psImagePixelManip.c
-tst_psImageSmooth_SOURCES = tst_psImageSmooth.c
-tst_psImageStats_SOURCES =  tst_psImageStats.c
-tst_psImageStructManip_SOURCES =  tst_psImageStructManip.c
-tst_psImageMaskOps_SOURCES = tst_psImageMaskOps.c
-
-check_DATA =
-
-check_PROGRAMS = $(TESTS)
-
-TESTS_ENVIRONMENT = perl $(top_srcdir)/test/runTest -verified=$(srcdir)/verified
-
-EXTRA_DIST = verified
-
-CLEANFILES = $(TESTS) $(check_DATA) temp/* fOut.fits sOut.fits fBiOut.fits sBiOut.fits \
+CLEANFILES = $(check_DATA) temp/* fOut.fits sOut.fits fBiOut.fits sBiOut.fits \
 	core core.* *~ *.bb *.bbg *.da gmon.out
 
-tests: $(TESTS) $(check_DATA)
-
 test: check