Index: trunk/psModules/test/objects/Makefile.am
===================================================================
--- trunk/psModules/test/objects/Makefile.am	(revision 13034)
+++ 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