[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:

11 files changed, 141 insertions, 66 deletions

diff --git a/tools/Makefile.in b/tools/Makefile.in
index 4d5182e..b7f255b 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -285,13 +285,16 @@ 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)!
-MOSTLYCLEANFILES = $(TEST_PROG_CHKEXE:.chkexe_=.chkexe)                    \
+# 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_SCRIPT_CHKSH:.chksh_=.chksh)                              \
-        $(TEST_SCRIPT_PARA_CHKSH:.chksh_=.chksh)                         \
         $(TEST_PROG_CHKEXE:.chkexe_=.log)                                \
-        $(TEST_SCRIPT_CHKSH:.chksh_=.logsh)
+        $(TEST_PROG_PARA_CHKEXE:.chkexe_=.log)                           \
+        *.chksh *.logsh
 
+MOSTLYCLEANFILES = $(CHECK_CLEANFILES)
 
 # All subdirectories
 SUBDIRS = lib h5dump h5diff h5ls misc gifconv h5import h5repack h5jam
@@ -638,7 +641,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                           \
@@ -658,6 +661,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.
diff --git a/tools/gifconv/Makefile.in b/tools/gifconv/Makefile.in
index b5b639d..b8c389a 100644
--- a/tools/gifconv/Makefile.in
+++ b/tools/gifconv/Makefile.in
@@ -308,13 +308,16 @@ 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)!
-MOSTLYCLEANFILES = $(TEST_PROG_CHKEXE:.chkexe_=.chkexe)                    \
+# 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_SCRIPT_CHKSH:.chksh_=.chksh)                              \
-        $(TEST_SCRIPT_PARA_CHKSH:.chksh_=.chksh)                         \
         $(TEST_PROG_CHKEXE:.chkexe_=.log)                                \
-        $(TEST_SCRIPT_CHKSH:.chksh_=.logsh)
+        $(TEST_PROG_PARA_CHKEXE:.chkexe_=.log)                           \
+        *.chksh *.logsh
 
+MOSTLYCLEANFILES = $(CHECK_CLEANFILES)
 
 # Include src and tools/lib directories
 INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/tools/lib
@@ -641,7 +644,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                           \
@@ -661,6 +664,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.
diff --git a/tools/h5diff/Makefile.in b/tools/h5diff/Makefile.in
index b5e7c41..10bb0eb 100644
--- a/tools/h5diff/Makefile.in
+++ b/tools/h5diff/Makefile.in
@@ -316,15 +316,19 @@ 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
+
 
 # Temporary files.  *.h5 are generated by h5diff.  They should
 # be copied to the testfiles/ directory if update is required
-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) *.h5 expect_sorted \
+MOSTLYCLEANFILES = $(CHECK_CLEANFILES) *.h5 expect_sorted \
 	actual_sorted
 
 # Include src and tools/lib directories
@@ -679,7 +683,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                           \
@@ -699,6 +703,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.
diff --git a/tools/h5dump/Makefile.in b/tools/h5dump/Makefile.in
index f8d1b96..5f129c2 100644
--- a/tools/h5dump/Makefile.in
+++ b/tools/h5dump/Makefile.in
@@ -309,15 +309,19 @@ 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
+
 
 # Temporary files.  *.h5 are generated by h5dumpgentest.  They should
 # copied to the testfiles/ directory if update is required.
-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) *.h5
+MOSTLYCLEANFILES = $(CHECK_CLEANFILES) *.h5
 
 # Include files in /src directory and /tools/lib directory
 INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/tools/lib
@@ -654,7 +658,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                           \
@@ -674,6 +678,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.
diff --git a/tools/h5import/Makefile.in b/tools/h5import/Makefile.in
index 4f1a039..062e65d 100755
--- a/tools/h5import/Makefile.in
+++ b/tools/h5import/Makefile.in
@@ -309,13 +309,16 @@ 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)!
-MOSTLYCLEANFILES = $(TEST_PROG_CHKEXE:.chkexe_=.chkexe)                    \
+# 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_SCRIPT_CHKSH:.chksh_=.chksh)                              \
-        $(TEST_SCRIPT_PARA_CHKSH:.chksh_=.chksh)                         \
         $(TEST_PROG_CHKEXE:.chkexe_=.log)                                \
-        $(TEST_SCRIPT_CHKSH:.chksh_=.logsh)
+        $(TEST_PROG_PARA_CHKEXE:.chkexe_=.log)                           \
+        *.chksh *.logsh
 
+MOSTLYCLEANFILES = $(CHECK_CLEANFILES)
 
 # Include src and tools/lib directories
 INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/tools/lib
@@ -648,7 +651,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                           \
@@ -668,6 +671,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.
diff --git a/tools/h5jam/Makefile.in b/tools/h5jam/Makefile.in
index 6d0c4a7..ac870ae 100644
--- a/tools/h5jam/Makefile.in
+++ b/tools/h5jam/Makefile.in
@@ -304,12 +304,16 @@ 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)!
-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) *.h5 *.txt
+# 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
 
 #
 # Copyright by the Board of Trustees of the University of Illinois.
@@ -671,7 +675,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                           \
@@ -691,6 +695,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.
diff --git a/tools/h5ls/Makefile.in b/tools/h5ls/Makefile.in
index 37187e3..65fe002 100644
--- a/tools/h5ls/Makefile.in
+++ b/tools/h5ls/Makefile.in
@@ -302,13 +302,16 @@ 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)!
-MOSTLYCLEANFILES = $(TEST_PROG_CHKEXE:.chkexe_=.chkexe)                    \
+# 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_SCRIPT_CHKSH:.chksh_=.chksh)                              \
-        $(TEST_SCRIPT_PARA_CHKSH:.chksh_=.chksh)                         \
         $(TEST_PROG_CHKEXE:.chkexe_=.log)                                \
-        $(TEST_SCRIPT_CHKSH:.chksh_=.logsh)
+        $(TEST_PROG_PARA_CHKEXE:.chkexe_=.log)                           \
+        *.chksh *.logsh
 
+MOSTLYCLEANFILES = $(CHECK_CLEANFILES)
 
 # Include src and tools/lib directories
 INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/tools/lib
@@ -628,7 +631,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                           \
@@ -648,6 +651,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.
diff --git a/tools/h5repack/Makefile.in b/tools/h5repack/Makefile.in
index cc8452c..cc1fbbc 100644
--- a/tools/h5repack/Makefile.in
+++ b/tools/h5repack/Makefile.in
@@ -324,15 +324,19 @@ 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
+
 
 # Temporary files.  *.h5 are generated by h5repack.  They should
 # copied to the testfiles/ directory if update is required.
-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) *.h5
+MOSTLYCLEANFILES = $(CHECK_CLEANFILES) *.h5
 
 # Include src, test, and tools/lib directories
 INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/test -I$(top_srcdir)/tools/lib
@@ -704,7 +708,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                           \
@@ -724,6 +728,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.
diff --git a/tools/lib/Makefile.in b/tools/lib/Makefile.in
index 8509c3d..b628570 100644
--- a/tools/lib/Makefile.in
+++ b/tools/lib/Makefile.in
@@ -306,13 +306,16 @@ 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)!
-MOSTLYCLEANFILES = $(TEST_PROG_CHKEXE:.chkexe_=.chkexe)                    \
+# 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_SCRIPT_CHKSH:.chksh_=.chksh)                              \
-        $(TEST_SCRIPT_PARA_CHKSH:.chksh_=.chksh)                         \
         $(TEST_PROG_CHKEXE:.chkexe_=.log)                                \
-        $(TEST_SCRIPT_CHKSH:.chksh_=.logsh)
+        $(TEST_PROG_PARA_CHKEXE:.chkexe_=.log)                           \
+        *.chksh *.logsh
 
+MOSTLYCLEANFILES = $(CHECK_CLEANFILES)
 
 # Include files in /src directory
 INCLUDES = -I$(top_srcdir)/src
@@ -645,7 +648,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                           \
@@ -665,6 +668,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.
diff --git a/tools/misc/Makefile.am b/tools/misc/Makefile.am
index 3e2e173..daf2323 100644
--- a/tools/misc/Makefile.am
+++ b/tools/misc/Makefile.am
@@ -61,12 +61,12 @@ else
 endif
 
 install-exec-local:
-	$(INSTALL) h5cc $(bindir)/$(H5CC_NAME)
+	@$(INSTALL) h5cc $(bindir)/$(H5CC_NAME)
 uninstall-local:
-	$(RM) $(bindir)/$(H5CC_NAME)
+	@$(RM) $(bindir)/$(H5CC_NAME)
 
 # How to build h5redeploy script
 h5redeploy: h5redeploy.in
-	cp $(srcdir)/$@.in $@
+	@cp $(srcdir)/$@.in $@
 
 include $(top_srcdir)/config/conclude.am
diff --git a/tools/misc/Makefile.in b/tools/misc/Makefile.in
index 0f0eded..8ff5389 100644
--- a/tools/misc/Makefile.in
+++ b/tools/misc/Makefile.in
@@ -329,16 +329,20 @@ 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
+
 
 # Temporary files.  *.h5 are generated by h5repart_gentest.  They should
 # copied to the testfiles/ directory if update is required. fst_family*.h5
 # and scd_family*.h5 were created by setting the HDF5_NOCLEANUP variable.
-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) *.h5 \
+MOSTLYCLEANFILES = $(CHECK_CLEANFILES) *.h5 \
 	../testfiles/fst_family*.h5 ../testfiles/scd_family*.h5
 
 # Include src directory
@@ -721,13 +725,13 @@ uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \
 check-install: installcheck
 
 install-exec-local:
-	$(INSTALL) h5cc $(bindir)/$(H5CC_NAME)
+	@$(INSTALL) h5cc $(bindir)/$(H5CC_NAME)
 uninstall-local:
-	$(RM) $(bindir)/$(H5CC_NAME)
+	@$(RM) $(bindir)/$(H5CC_NAME)
 
 # How to build h5redeploy script
 h5redeploy: h5redeploy.in
-	cp $(srcdir)/$@.in $@
+	@cp $(srcdir)/$@.in $@
 
 # lib/progs/tests targets recurse into subdirectories. build-* targets
 # build files in this directory.
@@ -737,7 +741,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                           \
@@ -757,6 +761,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.