Index: /trunk/psModules/configure.ac
===================================================================
--- /trunk/psModules/configure.ac	(revision 8917)
+++ /trunk/psModules/configure.ac	(revision 8918)
@@ -3,4 +3,7 @@
 AC_INIT([psmodules],[0.12.99],[http://pan-starrs.ifa.hawaii.edu/bugzilla])
 AC_CONFIG_SRCDIR([psmodules.pc.in])
+
+dnl this enables the building of libtap
+AC_CONFIG_SUBDIRS([test/tap])
 
 AM_INIT_AUTOMAKE([1.7 foreign dist-bzip2])
Index: /trunk/psModules/test/detrend/Makefile.am
===================================================================
--- /trunk/psModules/test/detrend/Makefile.am	(revision 8917)
+++ /trunk/psModules/test/detrend/Makefile.am	(revision 8918)
@@ -1,25 +1,15 @@
-AM_LDFLAGS = -L$(top_builddir)/src -lpsmodules $(PSMODULES_LIBS)
-AM_CFLAGS  = @AM_CFLAGS@ $(PSMODULES_CFLAGS) $(SRCINC)
-AM_CPPFLAGS = $(SRCINC) $(PSLIB_CFLAGS)
+AM_CPPFLAGS = \
+	$(SRCINC) \
+	-I$(top_srcdir)/test/tap/src \
+	$(PSMODULES_CFLAGS)
 
-TESTS = \
-    tst_pmFlatField \
-    tst_pmMaskBadPixels \
-    tst_pmNonLinear
+AM_LDFLAGS = \
+	$(top_builddir)/src/libpsmodules.la  \
+	$(top_builddir)/test/tap/src/libtap.la \
+	$(PSMODULES_LIBS)
 
-tst_pmFlatField_SOURCES = tst_pmFlatField.c
-tst_pmMaskBadPixels_SOURCES = tst_pmMaskBadPixels.c
-tst_pmNonLinear_SOURCES = tst_pmNonLinear.c
+check_PROGRAMS = tap_pmShutterCorrection
 
-check_PROGRAMS = $(TESTS)
-
-TESTS_ENVIRONMENT = perl $(top_srcdir)/test/runTest --verified=$(srcdir)/verified
-
-tests: $(TESTS)
-
-EXTRA_DIST = verified
-
-CLEANFILES = $(TESTS) temp/* .tmp_tst_pmNonLinearLookupFile *~
-
+CLEANFILES = temp/* core core.* *~
 
 test: check
Index: /trunk/psModules/test/tap/src/Makefile.am
===================================================================
--- /trunk/psModules/test/tap/src/Makefile.am	(revision 8917)
+++ /trunk/psModules/test/tap/src/Makefile.am	(revision 8918)
@@ -1,5 +1,5 @@
 TEST_LTLIBS = libtap.la
 libtap_la_SOURCES = tap.c tap.h
-include_HEADERS = tap.h
+noinst_HEADERS = tap.h
 
 if BUILD_TESTS