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