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

10 files changed, 97 insertions, 78 deletions

diff --git a/fortran/Makefile.am b/fortran/Makefile.am
index dce1857..9a988d9 100644
--- a/fortran/Makefile.am
+++ b/fortran/Makefile.am
@@ -38,24 +38,24 @@ DIST_SUBDIRS=src test testpar examples
 
 # Clean and mostlyclean need to recurse into examples directory     
 clean-local:     
-	if test -f examples/Makefile; then                                \
+	@if test -f examples/Makefile; then                                \
 	  (cd examples && $(MAKE) $(AM_MAKEFLAGS) clean) || exit 1;       \
 	fi;
 mostlyclean-local:         
-	if test -f examples/Makefile; then                                \
+	@if test -f examples/Makefile; then                                \
 	  (cd examples && $(MAKE) $(AM_MAKEFLAGS) mostlyclean) || exit 1; \
 	fi; 
 
 # Install examples
 install-examples uninstall-examples:
-	(cd examples && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;
+	@(cd examples && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;
 
 
 # Check that examples can be successfully built 
 check-install:
-	$(MAKE) $(AM_MAKEFLAGS) installcheck 
+	@$(MAKE) $(AM_MAKEFLAGS) installcheck 
 
 installcheck-local:
-	(cd examples && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;
+	@(cd examples && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;
 
 include $(top_srcdir)/config/conclude.am
diff --git a/fortran/Makefile.in b/fortran/Makefile.in
index 127300a..b2da807 100644
--- a/fortran/Makefile.in
+++ b/fortran/Makefile.in
@@ -288,13 +288,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)
 @BUILD_PARALLEL_CONDITIONAL_TRUE@TESTPARALLEL_DIR = testpar
 
 # Subdirectories in build order, not including examples directory
@@ -641,24 +644,24 @@ check-install: installcheck
 
 # Clean and mostlyclean need to recurse into examples directory     
 clean-local:     
-	if test -f examples/Makefile; then                                \
+	@if test -f examples/Makefile; then                                \
 	  (cd examples && $(MAKE) $(AM_MAKEFLAGS) clean) || exit 1;       \
 	fi;
 mostlyclean-local:         
-	if test -f examples/Makefile; then                                \
+	@if test -f examples/Makefile; then                                \
 	  (cd examples && $(MAKE) $(AM_MAKEFLAGS) mostlyclean) || exit 1; \
 	fi; 
 
 # Install examples
 install-examples uninstall-examples:
-	(cd examples && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;
+	@(cd examples && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;
 
 # Check that examples can be successfully built 
 check-install:
-	$(MAKE) $(AM_MAKEFLAGS) installcheck 
+	@$(MAKE) $(AM_MAKEFLAGS) installcheck 
 
 installcheck-local:
-	(cd examples && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;
+	@(cd examples && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;
 
 # lib/progs/tests targets recurse into subdirectories. build-* targets
 # build files in this directory.
@@ -668,7 +671,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                           \
@@ -688,6 +691,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/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.
diff --git a/fortran/src/Makefile.am b/fortran/src/Makefile.am
index cc46d1c..8b7a1f5 100644
--- a/fortran/src/Makefile.am
+++ b/fortran/src/Makefile.am
@@ -65,26 +65,26 @@ MOSTLYCLEANFILES+=H5fortran_types.f90 H5f90i_gen.h H5fort_type_defines.h \
 maintainer-clean-local: clean-local
 distclean-local: clean-local
 clean-local:
-	if test -n "$(F9XMODEXT)" && test "X$(F9XMODEXT)" != "Xo"; then \
+	@if test -n "$(F9XMODEXT)" && test "X$(F9XMODEXT)" != "Xo"; then \
 	  $(RM) *.$(F9XMODEXT);                                         \
 	fi
 
 install-data-local:
-	if test -n "$(F9XMODEXT)" && test "X$(F9XMODEXT)" != "Xo"; then \
+	@if test -n "$(F9XMODEXT)" && test "X$(F9XMODEXT)" != "Xo"; then \
 	  $(CP) $(top_builddir)/$(subdir)/*.$(F9XMODEXT) $(includedir)/. ; \
 	fi
 
 uninstall-local:
-	if test -n "$(F9XMODEXT)" -a "X$(F9XMODEXT)" != "Xo"; then      \
+	@if test -n "$(F9XMODEXT)" -a "X$(F9XMODEXT)" != "Xo"; then      \
 	  if test -f "$(includedir)/hdf5.$(F9XMODEXT)" -o -f "$(includedir)/HDF5.$(F9XMODEXT)"; then \
 	    set -x; $(RM) $(includedir)/*.$(F9XMODEXT);                 \
 	  fi;                                                           \
 	fi;								\
-	$(RM) $(bindir)/$(H5FC_NAME)
+	@$(RM) $(bindir)/$(H5FC_NAME)
 
 # Also install and uninstall (uninstall-local above) h5fc script
 install-exec-local:
-	$(INSTALL) h5fc $(bindir)/$(H5FC_NAME)   
+	@$(INSTALL) h5fc $(bindir)/$(H5FC_NAME)   
 
 # Install libhdf5_fortran.settings in lib directory
 settingsdir=$(libdir)
diff --git a/fortran/src/Makefile.in b/fortran/src/Makefile.in
index 5fb6ecf..9226e92 100644
--- a/fortran/src/Makefile.in
+++ b/fortran/src/Makefile.in
@@ -343,16 +343,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
+
 
 # H5fortran_types.f90 and H5f90i.h are automatically generaed by
 # H5match_types, and must be cleaned explicitly.  H5fort_type_defines.h
 # is generated by H5fortran_detect
-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) H5fortran_types.f90 \
+MOSTLYCLEANFILES = $(CHECK_CLEANFILES) H5fortran_types.f90 \
 	H5f90i_gen.h H5fort_type_defines.h H5fortran_detect.f90
 
 # Include src directory in both Fortran and C flags (C compiler is used
@@ -786,26 +790,26 @@ check-install: installcheck
 maintainer-clean-local: clean-local
 distclean-local: clean-local
 clean-local:
-	if test -n "$(F9XMODEXT)" && test "X$(F9XMODEXT)" != "Xo"; then \
+	@if test -n "$(F9XMODEXT)" && test "X$(F9XMODEXT)" != "Xo"; then \
 	  $(RM) *.$(F9XMODEXT);                                         \
 	fi
 
 install-data-local:
-	if test -n "$(F9XMODEXT)" && test "X$(F9XMODEXT)" != "Xo"; then \
+	@if test -n "$(F9XMODEXT)" && test "X$(F9XMODEXT)" != "Xo"; then \
 	  $(CP) $(top_builddir)/$(subdir)/*.$(F9XMODEXT) $(includedir)/. ; \
 	fi
 
 uninstall-local:
-	if test -n "$(F9XMODEXT)" -a "X$(F9XMODEXT)" != "Xo"; then      \
+	@if test -n "$(F9XMODEXT)" -a "X$(F9XMODEXT)" != "Xo"; then      \
 	  if test -f "$(includedir)/hdf5.$(F9XMODEXT)" -o -f "$(includedir)/HDF5.$(F9XMODEXT)"; then \
 	    set -x; $(RM) $(includedir)/*.$(F9XMODEXT);                 \
 	  fi;                                                           \
 	fi;								\
-	$(RM) $(bindir)/$(H5FC_NAME)
+	@$(RM) $(bindir)/$(H5FC_NAME)
 
 # Also install and uninstall (uninstall-local above) h5fc script
 install-exec-local:
-	$(INSTALL) h5fc $(bindir)/$(H5FC_NAME)   
+	@$(INSTALL) h5fc $(bindir)/$(H5FC_NAME)   
 
 #Specify what Automake needs to create: first the H5fort_type_defines.h
 # header, then H5match_types which includes that header, then
@@ -860,7 +864,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                           \
@@ -880,6 +884,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/fortran/test/Makefile.am b/fortran/test/Makefile.am
index 2370590..6ecee2f 100644
--- a/fortran/test/Makefile.am
+++ b/fortran/test/Makefile.am
@@ -61,11 +61,4 @@ MOSTLYCLEANFILES+=*.h5 *.tmp
 # from tests in conclude.am)
 HDF_FORTRAN=yes
 
-## Fortran dependencies must be hardcoded, unfortunately.
-##FORTLIBTEST_OBJ= fortranlib_test.lo                                    \
-##        tH5F.lo tH5D.lo tH5R.lo tH5S.lo tH5T.lo tH5VL.lo tH5Z.lo       \
-##        tH5Sselect.lo tH5P.lo tH5A.lo tH5I.lo tH5G.lo tH5E.lo tf.lo    \
-##        t.lo
-##fortranlib_test$(EXEEXT): $(FORTLIBTEST_OBJ)
-
 include $(top_srcdir)/config/conclude.am
diff --git a/fortran/test/Makefile.in b/fortran/test/Makefile.in
index 06dbb96..66dad14 100644
--- a/fortran/test/Makefile.in
+++ b/fortran/test/Makefile.in
@@ -345,14 +345,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
+
 
 # Temporary files
-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 *.tmp
+MOSTLYCLEANFILES = $(CHECK_CLEANFILES) *.h5 *.tmp
 
 # Include files
 AM_FCFLAGS = -I$(top_builddir)/fortran/src $(F9XMODFLAG)$(top_builddir)/fortran/src
@@ -829,7 +833,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                           \
@@ -849,6 +853,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/fortran/testpar/Makefile.am b/fortran/testpar/Makefile.am
index 75c1588..30cf60b 100644
--- a/fortran/testpar/Makefile.am
+++ b/fortran/testpar/Makefile.am
@@ -42,10 +42,4 @@ LDADD=$(LIBH5FTEST) $(LIBH5TEST) $(LIBH5F) $(LIBHDF5)
 # Mark this directory as part of the Fortran API
 HDF_FORTRAN=yes
 
-# Put in dependencies to the THDF5 module so that things will be built
-# in the correct order.
-#thdf5.lo:		   thdf5.o
-#thyperslab_wr.o:           $(srcdir)/thyperslab_wr.f90 thdf5.lo
-#ptesthdf5_fortran.o:       $(srcdir)/ptesthdf5_fortran.f90 thdf5.lo
-
 include $(top_srcdir)/config/conclude.am
diff --git a/fortran/testpar/Makefile.in b/fortran/testpar/Makefile.in
index 374c2cb..4c0ebd7 100644
--- a/fortran/testpar/Makefile.in
+++ b/fortran/testpar/Makefile.in
@@ -300,13 +300,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
 AM_FCFLAGS = -I$(top_srcdir)/fortran/src -I$(top_srcdir)/fortran/test $(F9XMODFLAG)$(top_builddir)/fortran/src
@@ -598,7 +601,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                           \
@@ -618,6 +621,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.
@@ -760,12 +767,6 @@ check-vfd:
 	        HDF5_DRIVER=$$vfd $(MAKE) $(AM_MAKEFLAGS) check;              \
 	    fi;                                                               \
 	done
-
-# Put in dependencies to the THDF5 module so that things will be built
-# in the correct order.
-#thdf5.lo:		   thdf5.o
-#thyperslab_wr.o:           $(srcdir)/thyperslab_wr.f90 thdf5.lo
-#ptesthdf5_fortran.o:       $(srcdir)/ptesthdf5_fortran.f90 thdf5.lo
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT: