[svn-r11185] Purpose:

Makefile feature

Description:
'make check-clean' now cleans *.h5 files created by tests as well as
.log and .chkexe files.

Solution:
check-clean is now a separate target in its own right, which cleans less
than mostlyclean (check-clean < mostlyclean < clean < distclean).

Platforms tested:
mir, heping, modi4 (serial and parallel)

2 files changed, 16 insertions, 13 deletions

diff --git a/tools/h5jam/Makefile.am b/tools/h5jam/Makefile.am
index 0bb0ea8..a6bbfbb 100644
--- a/tools/h5jam/Makefile.am
+++ b/tools/h5jam/Makefile.am
@@ -30,9 +30,9 @@ check_SCRIPTS=$(TEST_SCRIPT)
 # Link against the main HDF5 library and tools library
 LDADD=$(LIBH5TOOLS) $(LIBHDF5)
 
-## Temporary files.  *.h5 are generated by jamgentest.  They should
-## copied to the testfiles/ directory if update is required.
-MOSTLYCLEANFILES+=*.h5 *.txt
+# Temporary files.  *.h5 are generated by jamgentest.  They should
+# copied to the testfiles/ directory if update is required.
+CHECK_CLEANFILES+=*.h5 *.txt
 DISTCLEANFILES=testh5jam.sh
 
 include $(top_srcdir)/config/conclude.am
diff --git a/tools/h5jam/Makefile.in b/tools/h5jam/Makefile.in
index ac870ae..bd655c5 100644
--- a/tools/h5jam/Makefile.in
+++ b/tools/h5jam/Makefile.in
@@ -307,13 +307,14 @@ H5FC_PP = $(bindir)/h5pfc
 # On the other hand, it is very hard to specify the exact name of .chksh and
 # .logsh files because some scripts live in the source tree, not the build
 # tree.  Thus, we clean all .logsh and .chksh files.
-CHECK_CLEANFILES = $(TEST_PROG_CHKEXE:.chkexe_=.chkexe)                    \
-        $(TEST_PROG_PARA_CHKEXE:.chkexe_=.chkexe)                        \
-        $(TEST_PROG_CHKEXE:.chkexe_=.log)                                \
-        $(TEST_PROG_PARA_CHKEXE:.chkexe_=.log)                           \
-        *.chksh *.logsh
 
-MOSTLYCLEANFILES = $(CHECK_CLEANFILES) *.h5 *.txt
+# Temporary files.  *.h5 are generated by jamgentest.  They should
+# copied to the testfiles/ directory if update is required.
+CHECK_CLEANFILES = $(TEST_PROG_CHKEXE:.chkexe_=.chkexe) \
+	$(TEST_PROG_PARA_CHKEXE:.chkexe_=.chkexe) \
+	$(TEST_PROG_CHKEXE:.chkexe_=.log) \
+	$(TEST_PROG_PARA_CHKEXE:.chkexe_=.log) *.chksh *.logsh *.h5 \
+	*.txt
 
 #
 # Copyright by the Board of Trustees of the University of Illinois.
@@ -585,7 +586,6 @@ install-strip:
 	  `test -z '$(STRIP)' || \
 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
-	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
 
 clean-generic:
 
@@ -635,7 +635,7 @@ maintainer-clean-am: distclean-am maintainer-clean-generic
 mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
+	mostlyclean-libtool mostlyclean-local
 
 pdf: pdf-am
 
@@ -657,8 +657,8 @@ uninstall-am: uninstall-binPROGRAMS uninstall-info-am
 	install-strip installcheck installcheck-am installdirs \
 	maintainer-clean maintainer-clean-generic mostlyclean \
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-binPROGRAMS uninstall-info-am
+	mostlyclean-local pdf pdf-am ps ps-am tags uninstall \
+	uninstall-am uninstall-binPROGRAMS uninstall-info-am
 
 
 # check-install is a synonym for installcheck.
@@ -699,6 +699,9 @@ install-doc uninstall-doc:
 build-check-clean:
 	$(RM) $(CHECK_CLEANFILES)
 
+# run check-clean whenever mostlyclean is run
+mostlyclean-local: build-check-clean
+
 # Run each test in order, passing $(TEST_FLAGS) to the program.
 # Since tests are done in a shell loop, "make -i" does apply inside it.
 # Set HDF5_Make_Ignore to a non-blank string to ignore errors inside the loop.