[svn-r11179] Purpose:

Feature: check-clean target

Description:
'make check-clean' cleans up output files from tests.

Solution:
Tests create foo.chkexe and foo.log files.  Scripts create foo.chksh and
foo.logsh files.  'make check-clean' will clean these files up so that
the tests can be re-run.
Also suppressed some not-very-useful output of Makefiles when it would
echo commands.

Platforms tested:
mir, sleipnir, modi4

Misc. update:

2 files changed, 23 insertions, 15 deletions

diff --git a/fortran/examples/Makefile.am b/fortran/examples/Makefile.am
index f01629a..09fe83c 100644
--- a/fortran/examples/Makefile.am
+++ b/fortran/examples/Makefile.am
@@ -75,9 +75,9 @@ $(EXAMPLEDIR):
 	-$(top_srcdir)/bin/mkdirs $@
 
 install-data-local:
-	$(MAKE) install-examples
+	@$(MAKE) install-examples
 uninstall-local:
-	$(MAKE) uninstall-examples
+	@$(MAKE) uninstall-examples
 
 # We're installing source files, not the example programs.  Add .f90 to each
 # example program to get its source (and do the same when uninstalling).
@@ -94,9 +94,9 @@ uninstall-examples:
 	fi
 
 check-install:
-	$(MAKE) installcheck
+	@$(MAKE) installcheck
 installcheck-local:
-	$(MAKE) check
+	@$(MAKE) check
 
 # List dependencies for each example.  Normally, automake would take
 # care of this for us, but if we tell automake about the programs it
diff --git a/fortran/examples/Makefile.in b/fortran/examples/Makefile.in
index b9404dc..df2a7fb 100644
--- a/fortran/examples/Makefile.in
+++ b/fortran/examples/Makefile.in
@@ -276,14 +276,18 @@ H5FC_PP = $(bindir)/h5pfc
 # Serial tests create .log and .logsh files.  It's important only to clean log
 # files generated by HDF5's tests, because the .log suffix is used for
 # other files (e.g., config.log)!
+# 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
+
 
 # Tell automake which files to clean
-MOSTLYCLEANFILES = $(TEST_PROG_CHKEXE:.chkexe_=.chkexe) \
-	$(TEST_PROG_PARA_CHKEXE:.chkexe_=.chkexe) \
-	$(TEST_SCRIPT_CHKSH:.chksh_=.chksh) \
-	$(TEST_SCRIPT_PARA_CHKSH:.chksh_=.chksh) \
-	$(TEST_PROG_CHKEXE:.chkexe_=.log) \
-	$(TEST_SCRIPT_CHKSH:.chksh_=.logsh) $(EXTRA_PROG:=.o)
+MOSTLYCLEANFILES = $(CHECK_CLEANFILES) $(EXTRA_PROG:=.o)
 
 # Compile parallel fortran examples only if parallel is enabled
 @BUILD_PARALLEL_CONDITIONAL_TRUE@TEST_PROG_PARA = ph5example
@@ -522,9 +526,9 @@ $(EXAMPLEDIR):
 	-$(top_srcdir)/bin/mkdirs $@
 
 install-data-local:
-	$(MAKE) install-examples
+	@$(MAKE) install-examples
 uninstall-local:
-	$(MAKE) uninstall-examples
+	@$(MAKE) uninstall-examples
 
 # We're installing source files, not the example programs.  Add .f90 to each
 # example program to get its source (and do the same when uninstalling).
@@ -541,9 +545,9 @@ uninstall-examples:
 	fi
 
 check-install:
-	$(MAKE) installcheck
+	@$(MAKE) installcheck
 installcheck-local:
-	$(MAKE) check
+	@$(MAKE) check
 
 # List dependencies for each example.  Normally, automake would take
 # care of this for us, but if we tell automake about the programs it
@@ -575,7 +579,7 @@ build-lib: $(BUILT_SOURCES) $(LIB)
 build-progs: $(BUILT_SOURCES) $(LIB) $(PROGS)
 build-tests: $(BUILT_SOURCES) $(LIB) $(PROGS) $(TESTS)
 
-lib progs tests check-s check-p ::
+lib progs tests check-s check-p check-clean ::
 	@$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1;
 	@for d in X $(SUBDIRS); do                                             \
 	    if test $$d != X && test $$d != .; then                           \
@@ -595,6 +599,10 @@ all-local: $(EXTRA_LIB) $(EXTRA_PROG) $(TESTS)
 install-doc uninstall-doc:
 	@echo "Nothing to be done."
 
+# clean up files generated by tests so they can be re-run.
+build-check-clean:
+	$(RM) $(CHECK_CLEANFILES)
+
 # 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.