[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, 17 insertions, 13 deletions

diff --git a/examples/Makefile.am b/examples/Makefile.am
index 31e1d7a..e23603d 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -45,7 +45,8 @@ INSTALL_FILES = h5_write.c h5_read.c h5_extend_write.c h5_chunk_read.c   \
           h5_reference.c h5_drivers.c ph5example.c
 
 # We need to tell automake what to clean
-MOSTLYCLEANFILES+=*.h5 *.raw *.meta *.clog *.o
+MOSTLYCLEANFILES=*.raw *.meta *.clog *.o
+CHECK_CLEANFILES+=*.h5
 CLEANFILES=$(TEST_PROG) $(TEST_PROG_PARA)
 
 # Additional dependencies for each program are listed below.
diff --git a/examples/Makefile.in b/examples/Makefile.in
index 77a8d93..427e89e 100644
--- a/examples/Makefile.in
+++ b/examples/Makefile.in
@@ -279,15 +279,10 @@ 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
-
-
-# We need to tell automake what to clean
-MOSTLYCLEANFILES = $(CHECK_CLEANFILES) *.h5 *.raw *.meta *.clog *.o
+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
 @BUILD_PARALLEL_CONDITIONAL_TRUE@TEST_PROG_PARA = ph5example
 
 # Example programs.
@@ -311,6 +306,9 @@ INSTALL_FILES = h5_write.c h5_read.c h5_extend_write.c h5_chunk_read.c   \
           h5_compound.c h5_group.c h5_select.c h5_attribute.c h5_mount.c \
           h5_reference.c h5_drivers.c ph5example.c
 
+
+# We need to tell automake what to clean
+MOSTLYCLEANFILES = *.raw *.meta *.clog *.o
 CLEANFILES = $(TEST_PROG) $(TEST_PROG_PARA)
 
 # How to install examples
@@ -477,7 +475,8 @@ maintainer-clean-am: distclean-am maintainer-clean-generic
 
 mostlyclean: mostlyclean-am
 
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool \
+	mostlyclean-local
 
 pdf: pdf-am
 
@@ -497,8 +496,9 @@ uninstall-am: uninstall-info-am uninstall-local
 	install-info-am install-man install-strip installcheck \
 	installcheck-am installcheck-local installdirs \
 	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	uninstall uninstall-am uninstall-info-am uninstall-local
+	mostlyclean-generic mostlyclean-libtool mostlyclean-local pdf \
+	pdf-am ps ps-am uninstall uninstall-am uninstall-info-am \
+	uninstall-local
 
 
 # check-install is a synonym for installcheck.
@@ -595,6 +595,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.