Index: /trunk/psModules/configure.ac
===================================================================
--- /trunk/psModules/configure.ac	(revision 13643)
+++ /trunk/psModules/configure.ac	(revision 13644)
@@ -28,4 +28,12 @@
 
 AC_PREFIX_DEFAULT([`pwd`])
+
+dnl build tests at the same time as the source code
+AC_ARG_ENABLE(tests,
+  [AS_HELP_STRING(--enable-tests,build tests at same time as source)],
+  [AC_MSG_RESULT(test building enabled)
+   tests=true],
+   [tests=false])
+AM_CONDITIONAL(BUILD_TESTS, test x$tests = xtrue)
 
 dnl ------------------- PERL options ---------------------
Index: /trunk/psModules/test/astrom/Makefile.am
===================================================================
--- /trunk/psModules/test/astrom/Makefile.am	(revision 13643)
+++ /trunk/psModules/test/astrom/Makefile.am	(revision 13644)
@@ -11,5 +11,5 @@
 	$(PSMODULES_LIBS)
 
-check_PROGRAMS = \
+TEST_PROGS = \
 	tap_pmAstrometryWCS \
 	tap_pmAstrometryWCS_DVO \
@@ -18,7 +18,13 @@
 	tap_pmAstrometryWCS_DVO4
 
+if BUILD_TESTS
+bin_PROGRAMS = $(TEST_PROGS)
+TESTS = $(TEST_PROGS)
+else
+check_PROGRAMS = $(TEST_PROGS)
+endif
+
+CLEANFILES = $(check_DATA) temp/* core core.* *~ *.bb *.bbg *.da gmon.out
+
 test: check
-
-tests: $(check_PROGRAMS)
 	$(top_srcdir)/test/test.pl
-
Index: /trunk/psModules/test/camera/Makefile.am
===================================================================
--- /trunk/psModules/test/camera/Makefile.am	(revision 13643)
+++ /trunk/psModules/test/camera/Makefile.am	(revision 13644)
@@ -1,7 +1,25 @@
-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 \
+	-I$(top_srcdir)/test/pstap/src \
+	$(PSMODULES_CFLAGS)
 
-check_PROGRAMS = 
+AM_LDFLAGS = \
+	$(top_builddir)/src/libpsmodules.la  \
+	$(top_builddir)/test/tap/src/libtap.la \
+	$(top_builddir)/test/pstap/src/libpstap.la \
+	$(PSMODULES_LIBS)
+
+TEST_PROGS =
+
+if BUILD_TESTS
+bin_PROGRAMS = $(TEST_PROGS)
+TESTS = $(TEST_PROGS)
+else
+check_PROGRAMS = $(TEST_PROGS)
+endif
+
+CLEANFILES = $(check_DATA) temp/* core core.* *~ *.bb *.bbg *.da gmon.out
 
 test: check
+	$(top_srcdir)/test/test.pl
Index: /trunk/psModules/test/concepts/Makefile.am
===================================================================
--- /trunk/psModules/test/concepts/Makefile.am	(revision 13643)
+++ /trunk/psModules/test/concepts/Makefile.am	(revision 13644)
@@ -1,7 +1,25 @@
-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 \
+	-I$(top_srcdir)/test/pstap/src \
+	$(PSMODULES_CFLAGS)
 
-check_PROGRAMS = 
+AM_LDFLAGS = \
+	$(top_builddir)/src/libpsmodules.la  \
+	$(top_builddir)/test/tap/src/libtap.la \
+	$(top_builddir)/test/pstap/src/libpstap.la \
+	$(PSMODULES_LIBS)
+
+TEST_PROGS =
+
+if BUILD_TESTS
+bin_PROGRAMS = $(TEST_PROGS)
+TESTS = $(TEST_PROGS)
+else
+check_PROGRAMS = $(TEST_PROGS)
+endif
+
+CLEANFILES = $(check_DATA) temp/* core core.* *~ *.bb *.bbg *.da gmon.out
 
 test: check
+	$(top_srcdir)/test/test.pl
Index: /trunk/psModules/test/config/Makefile.am
===================================================================
--- /trunk/psModules/test/config/Makefile.am	(revision 13643)
+++ /trunk/psModules/test/config/Makefile.am	(revision 13644)
@@ -1,3 +1,2 @@
-
 AM_CPPFLAGS = \
 	$(SRCINC) \
@@ -12,7 +11,6 @@
 	$(PSMODULES_LIBS)
 
-AM_CFLAGS  = @AM_CFLAGS@ $(PSMODULES_CFLAGS) $(SRCINC)
-
-check_PROGRAMS = 
+TEST_PROGS = \
+	tst_pmConfig
 
 check_DATA = \
@@ -24,5 +22,13 @@
 EXTRA_DIST = data
 
-CLEANFILES = $(check_DATA) *~
+if BUILD_TESTS
+bin_PROGRAMS = $(TEST_PROGS)
+TESTS = $(TEST_PROGS)
+else
+check_PROGRAMS = $(TEST_PROGS)
+endif
+
+CLEANFILES = $(check_DATA) temp/* core core.* *~ *.bb *.bbg *.da gmon.out
 
 test: check
+	$(top_srcdir)/test/test.pl
Index: /trunk/psModules/test/detrend/Makefile.am
===================================================================
--- /trunk/psModules/test/detrend/Makefile.am	(revision 13643)
+++ /trunk/psModules/test/detrend/Makefile.am	(revision 13644)
@@ -1,3 +1,2 @@
-
 AM_CPPFLAGS = \
 	$(SRCINC) \
@@ -12,7 +11,16 @@
 	$(PSMODULES_LIBS)
 
-check_PROGRAMS = tap_pmShutterCorrection
+TEST_PROGS = \
+	tap_pmShutterCorrection
 
-CLEANFILES = temp/* core core.* *~
+if BUILD_TESTS
+bin_PROGRAMS = $(TEST_PROGS)
+TESTS = $(TEST_PROGS)
+else
+check_PROGRAMS = $(TEST_PROGS)
+endif
+
+CLEANFILES = $(check_DATA) temp/* core core.* *~ *.bb *.bbg *.da gmon.out
 
 test: check
+	$(top_srcdir)/test/test.pl
Index: /trunk/psModules/test/extras/Makefile.am
===================================================================
--- /trunk/psModules/test/extras/Makefile.am	(revision 13643)
+++ /trunk/psModules/test/extras/Makefile.am	(revision 13644)
@@ -1,3 +1,2 @@
-
 AM_CPPFLAGS = \
 	$(SRCINC) \
@@ -12,8 +11,15 @@
 	$(PSMODULES_LIBS)
 
-# XXX is this desired?
-# AM_CFLAGS  = @AM_CFLAGS@ $(PSMODULES_CFLAGS) $(SRCINC)
+TEST_PROGS =
 
-check_PROGRAMS =
+if BUILD_TESTS
+bin_PROGRAMS = $(TEST_PROGS)
+TESTS = $(TEST_PROGS)
+else
+check_PROGRAMS = $(TEST_PROGS)
+endif
+
+CLEANFILES = $(check_DATA) temp/* core core.* *~ *.bb *.bbg *.da gmon.out
 
 test: check
+	$(top_srcdir)/test/test.pl
Index: /trunk/psModules/test/imcombine/Makefile.am
===================================================================
--- /trunk/psModules/test/imcombine/Makefile.am	(revision 13643)
+++ /trunk/psModules/test/imcombine/Makefile.am	(revision 13644)
@@ -11,10 +11,16 @@
 	$(PSMODULES_LIBS)
 
-TESTS = \
+TEST_PROGS = \
 	tap_pmImageCombine
 
-check_PROGRAMS = $(TESTS)
+if BUILD_TESTS
+bin_PROGRAMS = $(TEST_PROGS)
+TESTS = $(TEST_PROGS)
+else
+check_PROGRAMS = $(TEST_PROGS)
+endif
 
-CLEANFILES = $(TESTS) temp/* *~
+CLEANFILES = $(check_DATA) temp/* core core.* *~ *.bb *.bbg *.da gmon.out
 
 test: check
+	$(top_srcdir)/test/test.pl
Index: /trunk/psModules/test/objects/Makefile.am
===================================================================
--- /trunk/psModules/test/objects/Makefile.am	(revision 13643)
+++ /trunk/psModules/test/objects/Makefile.am	(revision 13644)
@@ -1,3 +1,2 @@
-
 AM_CPPFLAGS = \
 	$(SRCINC) \
@@ -12,8 +11,5 @@
 	$(PSMODULES_LIBS)
 
-# XXX is this desired?
-# AM_CFLAGS  = @AM_CFLAGS@ $(PSMODULES_CFLAGS) $(SRCINC)
-
-check_PROGRAMS = \
+TEST_PROGS = \
 	tap_pmSourcePhotometry \
 	tap_pmGrowthCurve \
@@ -21,3 +17,13 @@
 	tap_pmSourceFitModel_Delta
 
+if BUILD_TESTS
+bin_PROGRAMS = $(TEST_PROGS)
+TESTS = $(TEST_PROGS)
+else
+check_PROGRAMS = $(TEST_PROGS)
+endif
+
+CLEANFILES = $(check_DATA) temp/* core core.* *~ *.bb *.bbg *.da gmon.out
+
 test: check
+	$(top_srcdir)/test/test.pl