[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)
2025-04-12 17:31:09 +08:00 · 2005-08-02 12:59:03 -05:00 · 2005-08-02 12:59:03 -05:00 · e75a185eca
commit e75a185eca
parent 7def00050f
54 changed files with 340 additions and 293 deletions
--- a/Makefile.am
+++ b/Makefile.am
@ -82,7 +82,7 @@ DISTCLEANFILES=src/H5config.h src/H5pubconf.h config/stamp1 config/stamp2
 # These simply involve recursing into subdirectories.
 test _test: check

-lib progs check-p check-s check-clean:
+lib progs check-p check-s:
 	@@SETX@; for d in $(SUBDIRS); do                                \
          if test $$d != .; then                                        \
 	   (cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;            \
@ -92,7 +92,7 @@ lib progs check-p check-s check-clean:
 # Make all, tests, and (un)install also recurse into perform directory
 all-local:
 	@cd perform && $(MAKE) $(AM_MAKEFLAGS) all
-tests:
+tests check-clean:
 	@@SETX@; for d in $(SUBDIRS) perform; do                        \
          if test $$d != .; then                                        \
 	   (cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;            \
--- a/Makefile.in
+++ b/Makefile.in
@ -323,7 +323,6 @@ CHECK_CLEANFILES = $(TEST_PROG_CHKEXE:.chkexe_=.chkexe)                    \
        $(TEST_PROG_PARA_CHKEXE:.chkexe_=.log)                           \
        *.chksh *.logsh

-MOSTLYCLEANFILES = $(CHECK_CLEANFILES)
@BUILD_PARALLEL_CONDITIONAL_FALSE@TESTPARALLEL_DIR = 

 # Define subdirectories to build.
@ -688,7 +687,6 @@ install-strip:
 	  `test -z '$(STRIP)' || \
 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
-	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)

 clean-generic:

@ -780,7 +778,7 @@ check-install: installcheck
 # These simply involve recursing into subdirectories.
 test _test: check

-lib progs check-p check-s check-clean:
+lib progs check-p check-s:
 	@@SETX@; for d in $(SUBDIRS); do                                \
          if test $$d != .; then                                        \
 	   (cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;            \
@ -790,7 +788,7 @@ lib progs check-p check-s check-clean:
 # Make all, tests, and (un)install also recurse into perform directory
 all-local:
 	@cd perform && $(MAKE) $(AM_MAKEFLAGS) all
-tests:
+tests check-clean:
 	@@SETX@; for d in $(SUBDIRS) perform; do                        \
          if test $$d != .; then                                        \
 	   (cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;            \
--- a/c++/Makefile.in
+++ b/c++/Makefile.in
@ -293,7 +293,6 @@ CHECK_CLEANFILES = $(TEST_PROG_CHKEXE:.chkexe_=.chkexe)                    \
        $(TEST_PROG_PARA_CHKEXE:.chkexe_=.log)                           \
        *.chksh *.logsh

-MOSTLYCLEANFILES = $(CHECK_CLEANFILES)
@BUILD_CXX_CONDITIONAL_TRUE@SUBDIRS = src test
 DIST_SUBDIRS = src test examples

@ -552,7 +551,6 @@ install-strip:
 	  `test -z '$(STRIP)' || \
 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
-	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)

 clean-generic:

@ -686,6 +684,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.
--- a/c++/examples/Makefile.am
+++ b/c++/examples/Makefile.am
@ -43,7 +43,8 @@ chunks.chkexe_: extend_ds.chkexe_
 # These are the files that 'make clean' (and derivatives) will remove from this
 # directory.  Since automake doesn't know about the examples, we need to
 # tell it to clean the example programs, too.
-MOSTLYCLEANFILES+=*.h5 $(EXTRA_PROG:=.o)
+CHECK_CLEANFILES+=*.h5
+MOSTLYCLEANFILES=$(EXTRA_PROG:=.o)
 CLEANFILES=$(EXTRA_PROG)

 # Tell conclude.am that these are C++ tests.
--- a/c++/examples/Makefile.in
+++ b/c++/examples/Makefile.in
@ -279,17 +279,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
-

 # These are the files that 'make clean' (and derivatives) will remove from this
 # directory.  Since automake doesn't know about the examples, we need to
 # tell it to clean the example programs, too.
-MOSTLYCLEANFILES = $(CHECK_CLEANFILES) *.h5 $(EXTRA_PROG:=.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

 # Use h5c++ to build examples, instead of reguar C++ compiler
 H5CPP = $(bindir)/h5c++
@ -306,6 +303,7 @@ EXTRA_PROG = $(TEST_PROG)
 INSTALL_FILES = create.cpp readdata.cpp writedata.cpp compound.cpp         \
              extend_ds.cpp chunks.cpp h5group.cpp

+MOSTLYCLEANFILES = $(EXTRA_PROG:=.o)
 CLEANFILES = $(EXTRA_PROG)

 # Tell conclude.am that these are C++ tests.
@ -472,7 +470,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

@ -492,8 +491,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.
@ -581,6 +581,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.
--- a/c++/src/Makefile.in
+++ b/c++/src/Makefile.in
@ -327,7 +327,6 @@ CHECK_CLEANFILES = $(TEST_PROG_CHKEXE:.chkexe_=.chkexe)                    \
        $(TEST_PROG_PARA_CHKEXE:.chkexe_=.log)                           \
        *.chksh *.logsh

-MOSTLYCLEANFILES = $(CHECK_CLEANFILES)

 # Include src directory
 INCLUDES = -I$(top_srcdir)/src
@ -647,7 +646,6 @@ install-strip:
 	  `test -z '$(STRIP)' || \
 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
-	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)

 clean-generic:

@ -772,6 +770,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.
--- a/c++/test/Makefile.in
+++ b/c++/test/Makefile.in
@ -316,7 +316,6 @@ CHECK_CLEANFILES = $(TEST_PROG_CHKEXE:.chkexe_=.chkexe)                    \
        $(TEST_PROG_PARA_CHKEXE:.chkexe_=.log)                           \
        *.chksh *.logsh

-MOSTLYCLEANFILES = $(CHECK_CLEANFILES)

 # Include src, test, and c++/src directories
 INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/test -I$(top_srcdir)/c++/src
@ -540,7 +539,6 @@ install-strip:
 	  `test -z '$(STRIP)' || \
 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
-	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)

 clean-generic:

@ -660,6 +658,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.
--- a/config/commence.am
+++ b/config/commence.am
@ -66,8 +66,6 @@ CHECK_CLEANFILES=$(TEST_PROG_CHKEXE:.chkexe_=.chkexe)                    \
        $(TEST_PROG_PARA_CHKEXE:.chkexe_=.log)                           \
        *.chksh *.logsh

-MOSTLYCLEANFILES=$(CHECK_CLEANFILES)
-
 # check-install is a synonym for installcheck.
 # Add this build rule here (rather than in conclude.am, where build rules
 # normally go) because it should be included in the top-level Makefile.am
--- a/config/conclude.am
+++ b/config/conclude.am
@ -46,6 +46,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.
--- 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.
--- 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.
--- a/fortran/Makefile.in
+++ b/fortran/Makefile.in
@ -297,7 +297,6 @@ CHECK_CLEANFILES = $(TEST_PROG_CHKEXE:.chkexe_=.chkexe)                    \
        $(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
@ -561,7 +560,6 @@ install-strip:
 	  `test -z '$(STRIP)' || \
 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
-	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)

 clean-generic:

@ -695,6 +693,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.
--- a/fortran/examples/Makefile.am
+++ b/fortran/examples/Makefile.am
@ -45,7 +45,7 @@ INSTALL_FILES=dsetexample.f90 fileexample.f90 rwdsetexample.f90             \
       refregexample.f90 mountexample.f90 compound.f90 ph5example.f90

 # Tell automake which files to clean
-MOSTLYCLEANFILES+=$(EXTRA_PROG:=.o)
+MOSTLYCLEANFILES=$(EXTRA_PROG:=.o)
 CLEANFILES=*.h5 $(EXTRA_PROG)

 # Mark this directory as part of the Fortran API
--- a/fortran/examples/Makefile.in
+++ b/fortran/examples/Makefile.in
@ -286,9 +286,6 @@ CHECK_CLEANFILES = $(TEST_PROG_CHKEXE:.chkexe_=.chkexe)                    \
        *.chksh *.logsh


-# Tell automake which files to clean
-MOSTLYCLEANFILES = $(CHECK_CLEANFILES) $(EXTRA_PROG:=.o)
-
 # Compile parallel fortran examples only if parallel is enabled
@BUILD_PARALLEL_CONDITIONAL_TRUE@TEST_PROG_PARA = ph5example

@ -312,6 +309,9 @@ INSTALL_FILES = dsetexample.f90 fileexample.f90 rwdsetexample.f90             \
       hyperslab.f90 selectele.f90 grpit.f90 refobjexample.f90              \
       refregexample.f90 mountexample.f90 compound.f90 ph5example.f90

+
+# Tell automake which files to clean
+MOSTLYCLEANFILES = $(EXTRA_PROG:=.o)
 CLEANFILES = *.h5 $(EXTRA_PROG)

 # Mark this directory as part of the Fortran API
@ -478,7 +478,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

@ -498,8 +499,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.
@ -603,6 +605,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.
--- a/fortran/src/Makefile.am
+++ b/fortran/src/Makefile.am
@ -55,7 +55,7 @@ DISTCLEANFILES=h5fc libhdf5_fortran.settings
 # 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+=H5fortran_types.f90 H5f90i_gen.h H5fort_type_defines.h \
+MOSTLYCLEANFILES=H5fortran_types.f90 H5f90i_gen.h H5fort_type_defines.h \
         H5fortran_detect.f90

 # Fortran module files can have different extensions and different names
--- a/fortran/src/Makefile.in
+++ b/fortran/src/Makefile.in
@ -353,12 +353,6 @@ CHECK_CLEANFILES = $(TEST_PROG_CHKEXE:.chkexe_=.chkexe)                    \
        *.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 = $(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
 # for linking).
 INCLUDES = -I$(top_srcdir)/src
@ -389,6 +383,13 @@ libhdf5_fortran_la_SOURCES = H5fortran_flags.f90 H5f90global.f90          \
 # Remove them only when distclean.
 DISTCLEANFILES = h5fc libhdf5_fortran.settings

+# 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 = H5fortran_types.f90 H5f90i_gen.h H5fort_type_defines.h \
+         H5fortran_detect.f90
+
+
 # Install libhdf5_fortran.settings in lib directory
 settingsdir = $(libdir)
 settings_DATA = libhdf5_fortran.settings
@ -746,7 +747,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

@ -771,8 +772,8 @@ uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES \
 	install-strip installcheck installcheck-am installdirs \
 	maintainer-clean maintainer-clean-generic \
 	maintainer-clean-local mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-info-am \
+	mostlyclean-generic mostlyclean-libtool mostlyclean-local pdf \
+	pdf-am ps ps-am tags uninstall uninstall-am uninstall-info-am \
 	uninstall-libLTLIBRARIES uninstall-local \
 	uninstall-settingsDATA

@ -888,6 +889,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.
--- a/fortran/test/Makefile.am
+++ b/fortran/test/Makefile.am
@ -55,7 +55,8 @@ LIBADD=$(LIBH5TEST) $(LIBHDF5) $(LIBH5F)
 LDADD=libh5test_fortran.la $(LIBH5TEST) $(LIBH5F) $(LIBHDF5)

 # Temporary files
-MOSTLYCLEANFILES+=*.h5 *.tmp
+CHECK_CLEANFILES+=*.h5
+MOSTLYCLEANFILES=*.tmp

 # Mark this directory as part of the Fortran API (this affects output
 # from tests in conclude.am)
--- a/fortran/test/Makefile.in
+++ b/fortran/test/Makefile.in
@ -348,15 +348,12 @@ 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
-

 # Temporary files
-MOSTLYCLEANFILES = $(CHECK_CLEANFILES) *.h5 *.tmp
+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

 # Include files
 AM_FCFLAGS = -I$(top_builddir)/fortran/src $(F9XMODFLAG)$(top_builddir)/fortran/src
@ -391,6 +388,7 @@ fflush2_SOURCES = fflush2.f90
 # The tests depend on both fortran libraries and both main libraries.
 LIBADD = $(LIBH5TEST) $(LIBHDF5) $(LIBH5F)
 LDADD = libh5test_fortran.la $(LIBH5TEST) $(LIBH5F) $(LIBHDF5)
+MOSTLYCLEANFILES = *.tmp

 # Mark this directory as part of the Fortran API (this affects output
 # from tests in conclude.am)
@ -793,7 +791,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

@ -815,8 +813,9 @@ uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES
 	install-man 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-info-am uninstall-libLTLIBRARIES
+	mostlyclean-libtool mostlyclean-local pdf pdf-am ps ps-am tags \
+	uninstall uninstall-am uninstall-info-am \
+	uninstall-libLTLIBRARIES


 # check-install is a synonym for installcheck.
@ -857,6 +856,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.
--- a/fortran/testpar/Makefile.am
+++ b/fortran/testpar/Makefile.am
@ -30,8 +30,7 @@ TEST_PROG_PARA=parallel_test
 check_PROGRAMS=$(TEST_PROG_PARA)

 # Temporary files
-MOSTLYCLEAN=ParaEg[123].h5f
-DISTCLEAN=go
+CHECK_CLEANFILES+=parf[12].h5

 # Test source files
 parallel_test_SOURCES=ptest.f90 hyper.f90 mdset.f90
--- a/fortran/testpar/Makefile.in
+++ b/fortran/testpar/Makefile.in
@ -303,13 +303,13 @@ 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)
+# Temporary 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 \
+	parf[12].h5

 # Include files
 AM_FCFLAGS = -I$(top_srcdir)/fortran/src -I$(top_srcdir)/fortran/test $(F9XMODFLAG)$(top_builddir)/fortran/src
@ -320,10 +320,6 @@ AM_LDFLAGS = -static
 # These are our main targets
 TEST_PROG_PARA = parallel_test

-# Temporary files
-MOSTLYCLEAN = ParaEg[123].h5f
-DISTCLEAN = go
-
 # Test source files
 parallel_test_SOURCES = ptest.f90 hyper.f90 mdset.f90

@ -515,7 +511,6 @@ install-strip:
 	  `test -z '$(STRIP)' || \
 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
-	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)

 clean-generic:

@ -562,7 +557,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

@ -583,8 +578,8 @@ uninstall-am: uninstall-info-am
 	install-info-am install-man 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-info-am
+	mostlyclean-generic mostlyclean-libtool mostlyclean-local pdf \
+	pdf-am ps ps-am tags uninstall uninstall-am uninstall-info-am


 # check-install is a synonym for installcheck.
@ -625,6 +620,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.
--- a/hl/Makefile.in
+++ b/hl/Makefile.in
@ -289,7 +289,6 @@ CHECK_CLEANFILES = $(TEST_PROG_CHKEXE:.chkexe_=.chkexe)                    \
        $(TEST_PROG_PARA_CHKEXE:.chkexe_=.log)                           \
        *.chksh *.logsh

-MOSTLYCLEANFILES = $(CHECK_CLEANFILES)
@BUILD_FORTRAN_CONDITIONAL_TRUE@FORTRAN_DIR = fortran
@BUILD_CXX_CONDITIONAL_TRUE@CXX_DIR = c++
@BUILD_HDF5_HL_CONDITIONAL_TRUE@SUBDIRS = src test $(CXX_DIR) $(FORTRAN_DIR)
@ -549,7 +548,6 @@ install-strip:
 	  `test -z '$(STRIP)' || \
 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
-	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)

 clean-generic:

@ -594,7 +592,8 @@ maintainer-clean-am: distclean-am maintainer-clean-generic

 mostlyclean: mostlyclean-recursive

-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool \
+	mostlyclean-local

 pdf: pdf-recursive

@ -618,8 +617,9 @@ uninstall-info: uninstall-info-recursive
 	install-strip installcheck installcheck-am installdirs \
 	installdirs-am maintainer-clean maintainer-clean-generic \
 	maintainer-clean-recursive mostlyclean mostlyclean-generic \
-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
-	tags tags-recursive uninstall uninstall-am uninstall-info-am
+	mostlyclean-libtool mostlyclean-local mostlyclean-recursive \
+	pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
+	uninstall-info-am


 # check-install is a synonym for installcheck.
@ -660,6 +660,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.
--- a/hl/c++/Makefile.in
+++ b/hl/c++/Makefile.in
@ -294,7 +294,6 @@ CHECK_CLEANFILES = $(TEST_PROG_CHKEXE:.chkexe_=.chkexe)                    \
        $(TEST_PROG_PARA_CHKEXE:.chkexe_=.log)                           \
        *.chksh *.logsh

-MOSTLYCLEANFILES = $(CHECK_CLEANFILES)
 SUBDIRS = src test

 # Automake needs to be taught how to build lib, progs, and tests targets.
@ -552,7 +551,6 @@ install-strip:
 	  `test -z '$(STRIP)' || \
 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
-	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)

 clean-generic:

@ -597,7 +595,8 @@ maintainer-clean-am: distclean-am maintainer-clean-generic

 mostlyclean: mostlyclean-recursive

-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool \
+	mostlyclean-local

 pdf: pdf-recursive

@ -621,8 +620,9 @@ uninstall-info: uninstall-info-recursive
 	install-strip installcheck installcheck-am installdirs \
 	installdirs-am maintainer-clean maintainer-clean-generic \
 	maintainer-clean-recursive mostlyclean mostlyclean-generic \
-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
-	tags tags-recursive uninstall uninstall-am uninstall-info-am
+	mostlyclean-libtool mostlyclean-local mostlyclean-recursive \
+	pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
+	uninstall-info-am


 # check-install is a synonym for installcheck.
@ -663,6 +663,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.
--- a/hl/c++/src/Makefile.in
+++ b/hl/c++/src/Makefile.in
@ -316,7 +316,6 @@ CHECK_CLEANFILES = $(TEST_PROG_CHKEXE:.chkexe_=.chkexe)                    \
        $(TEST_PROG_PARA_CHKEXE:.chkexe_=.log)                           \
        *.chksh *.logsh

-MOSTLYCLEANFILES = $(CHECK_CLEANFILES)

 # Include src directory
 INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/hl/src
@ -570,7 +569,6 @@ install-strip:
 	  `test -z '$(STRIP)' || \
 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
-	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)

 clean-generic:

@ -619,7 +617,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

@ -642,9 +640,10 @@ uninstall-am: uninstall-includeHEADERS uninstall-info-am \
 	install-libLTLIBRARIES install-man 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-includeHEADERS \
-	uninstall-info-am uninstall-libLTLIBRARIES
+	mostlyclean-generic mostlyclean-libtool mostlyclean-local pdf \
+	pdf-am ps ps-am tags uninstall uninstall-am \
+	uninstall-includeHEADERS uninstall-info-am \
+	uninstall-libLTLIBRARIES


 # check-install is a synonym for installcheck.
@ -685,6 +684,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.
--- a/hl/c++/test/Makefile.in
+++ b/hl/c++/test/Makefile.in
@ -310,7 +310,6 @@ CHECK_CLEANFILES = $(TEST_PROG_CHKEXE:.chkexe_=.chkexe)                    \
        $(TEST_PROG_PARA_CHKEXE:.chkexe_=.log)                           \
        *.chksh *.logsh

-MOSTLYCLEANFILES = $(CHECK_CLEANFILES)

 # Include directories
 INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/hl/src -I$(top_srcdir)/hl/c++/src -I$(top_srcdir)/test
@ -522,7 +521,6 @@ install-strip:
 	  `test -z '$(STRIP)' || \
 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
-	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)

 clean-generic:

@ -571,7 +569,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

@ -592,8 +590,8 @@ uninstall-am: uninstall-info-am
 	install-info-am install-man 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-info-am
+	mostlyclean-generic mostlyclean-libtool mostlyclean-local pdf \
+	pdf-am ps ps-am tags uninstall uninstall-am uninstall-info-am


 # check-install is a synonym for installcheck.
@ -634,6 +632,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.
--- a/hl/fortran/Makefile.in
+++ b/hl/fortran/Makefile.in
@ -289,7 +289,6 @@ CHECK_CLEANFILES = $(TEST_PROG_CHKEXE:.chkexe_=.chkexe)                    \
        $(TEST_PROG_PARA_CHKEXE:.chkexe_=.log)                           \
        *.chksh *.logsh

-MOSTLYCLEANFILES = $(CHECK_CLEANFILES)
 SUBDIRS = src test

 # Automake needs to be taught how to build lib, progs, and tests targets.
@ -547,7 +546,6 @@ install-strip:
 	  `test -z '$(STRIP)' || \
 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
-	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)

 clean-generic:

@ -592,7 +590,8 @@ maintainer-clean-am: distclean-am maintainer-clean-generic

 mostlyclean: mostlyclean-recursive

-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool \
+	mostlyclean-local

 pdf: pdf-recursive

@ -616,8 +615,9 @@ uninstall-info: uninstall-info-recursive
 	install-strip installcheck installcheck-am installdirs \
 	installdirs-am maintainer-clean maintainer-clean-generic \
 	maintainer-clean-recursive mostlyclean mostlyclean-generic \
-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
-	tags tags-recursive uninstall uninstall-am uninstall-info-am
+	mostlyclean-libtool mostlyclean-local mostlyclean-recursive \
+	pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
+	uninstall-info-am


 # check-install is a synonym for installcheck.
@ -658,6 +658,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.
--- a/hl/fortran/src/Makefile.in
+++ b/hl/fortran/src/Makefile.in
@ -310,7 +310,6 @@ CHECK_CLEANFILES = $(TEST_PROG_CHKEXE:.chkexe_=.chkexe)                    \
        $(TEST_PROG_PARA_CHKEXE:.chkexe_=.log)                           \
        *.chksh *.logsh

-MOSTLYCLEANFILES = $(CHECK_CLEANFILES)
 INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/hl/src -I$(top_builddir)/hl/src \
         -I$(top_srcdir)/fortran/src -I$(top_builddir)/fortran/src

@ -559,7 +558,6 @@ install-strip:
 	  `test -z '$(STRIP)' || \
 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
-	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)

 clean-generic:

@ -609,7 +607,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

@ -633,8 +631,8 @@ uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES \
 	install-strip installcheck installcheck-am installdirs \
 	maintainer-clean maintainer-clean-generic \
 	maintainer-clean-local mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-info-am \
+	mostlyclean-generic mostlyclean-libtool mostlyclean-local pdf \
+	pdf-am ps ps-am tags uninstall uninstall-am uninstall-info-am \
 	uninstall-libLTLIBRARIES uninstall-local


@ -707,6 +705,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.
--- a/hl/fortran/test/Makefile.am
+++ b/hl/fortran/test/Makefile.am
@ -29,6 +29,6 @@ tstimage_SOURCES=tstimage.f90
 tsttable_SOURCES=tsttable.f90

 # Temporary files.
-MOSTLYCLEANFILES+=dsetf[1-4].h5 f1img.h5 f1tab.h5
+CHECK_CLEANFILES+=dsetf[1-4].h5 f1img.h5 f1tab.h5

 include $(top_srcdir)/config/conclude.am
--- a/hl/fortran/test/Makefile.in
+++ b/hl/fortran/test/Makefile.in
@ -303,15 +303,13 @@ 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
-

 # Temporary files.
-MOSTLYCLEANFILES = $(CHECK_CLEANFILES) dsetf[1-4].h5 f1img.h5 f1tab.h5
+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 \
+	dsetf[1-4].h5 f1img.h5 f1tab.h5
 AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src -I$(top_srcdir)/hl/src
 AM_FCFLAGS = -I$(top_builddir)/fortran/src -I$(top_builddir)/hl/fortran/src $(F9XMODFLAG)$(top_builddir)/fortran/src $(F9XMODFLAG)$(top_builddir)/hl/fortran/src

@ -515,7 +513,6 @@ install-strip:
 	  `test -z '$(STRIP)' || \
 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
-	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)

 clean-generic:

@ -562,7 +559,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

@ -583,8 +580,8 @@ uninstall-am: uninstall-info-am
 	install-info-am install-man 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-info-am
+	mostlyclean-generic mostlyclean-libtool mostlyclean-local pdf \
+	pdf-am ps ps-am tags uninstall uninstall-am uninstall-info-am


 # check-install is a synonym for installcheck.
@ -625,6 +622,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.
--- a/hl/src/Makefile.in
+++ b/hl/src/Makefile.in
@ -307,7 +307,6 @@ CHECK_CLEANFILES = $(TEST_PROG_CHKEXE:.chkexe_=.chkexe)                    \
        $(TEST_PROG_PARA_CHKEXE:.chkexe_=.log)                           \
        *.chksh *.logsh

-MOSTLYCLEANFILES = $(CHECK_CLEANFILES)

 # Add include directories to the C preprocessor flags
 AM_CPPFLAGS = -I$(top_srcdir)/src
@ -558,7 +557,6 @@ install-strip:
 	  `test -z '$(STRIP)' || \
 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
-	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)

 clean-generic:

@ -607,7 +605,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

@ -630,9 +628,10 @@ uninstall-am: uninstall-includeHEADERS uninstall-info-am \
 	install-libLTLIBRARIES install-man 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-includeHEADERS \
-	uninstall-info-am uninstall-libLTLIBRARIES
+	mostlyclean-generic mostlyclean-libtool mostlyclean-local pdf \
+	pdf-am ps ps-am tags uninstall uninstall-am \
+	uninstall-includeHEADERS uninstall-info-am \
+	uninstall-libLTLIBRARIES


 # check-install is a synonym for installcheck.
@ -673,6 +672,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.
--- a/hl/test/Makefile.am
+++ b/hl/test/Makefile.am
@ -22,7 +22,7 @@ TEST_PROG=test_lite test_image test_table test_ds test_packet
 check_PROGRAMS=$(TEST_PROG)

 # Temporary files.  These files are the ones created by running `make test'.
-MOSTLYCLEANFILES+=combine_tables[1-2].h5 test_ds[1-6].h5 test_image[1-3].h5 \
+CHECK_CLEANFILES+=combine_tables[1-2].h5 test_ds[1-6].h5 test_image[1-3].h5 \
        test_lite[1-2].h5 test_table.h5 test_packet_table.h5

 include $(top_srcdir)/config/conclude.am
--- a/hl/test/Makefile.in
+++ b/hl/test/Makefile.in
@ -313,17 +313,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
-

 # Temporary files.  These files are the ones created by running `make test'.
-MOSTLYCLEANFILES = $(CHECK_CLEANFILES) combine_tables[1-2].h5 \
-	test_ds[1-6].h5 test_image[1-3].h5 test_lite[1-2].h5 \
-	test_table.h5 test_packet_table.h5
+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 \
+	combine_tables[1-2].h5 test_ds[1-6].h5 test_image[1-3].h5 \
+	test_lite[1-2].h5 test_table.h5 test_packet_table.h5

 # Add include directories to C preprocessor flags
 AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_builddir)/src -I$(top_srcdir)/src -I$(top_srcdir)/hl/src
@ -547,7 +544,6 @@ install-strip:
 	  `test -z '$(STRIP)' || \
 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
-	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)

 clean-generic:

@ -596,7 +592,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

@ -617,8 +613,8 @@ uninstall-am: uninstall-info-am
 	install-info-am install-man 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-info-am
+	mostlyclean-generic mostlyclean-libtool mostlyclean-local pdf \
+	pdf-am ps ps-am tags uninstall uninstall-am uninstall-info-am


 # check-install is a synonym for installcheck.
@ -659,6 +655,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.
--- a/hl/tools/gif2h5/Makefile.in
+++ b/hl/tools/gif2h5/Makefile.in
@ -317,7 +317,6 @@ CHECK_CLEANFILES = $(TEST_PROG_CHKEXE:.chkexe_=.chkexe)                    \
        $(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
@ -556,7 +555,6 @@ install-strip:
 	  `test -z '$(STRIP)' || \
 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
-	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)

 clean-generic:

@ -604,7 +602,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

@ -625,9 +623,9 @@ uninstall-am: uninstall-binPROGRAMS uninstall-info-am
 	install-info install-info-am install-man 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-generic mostlyclean-libtool mostlyclean-local pdf \
+	pdf-am ps ps-am tags uninstall uninstall-am \
+	uninstall-binPROGRAMS uninstall-info-am


 # check-install is a synonym for installcheck.
@ -668,6 +666,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.
--- a/perform/Makefile.in
+++ b/perform/Makefile.in
@ -338,7 +338,6 @@ CHECK_CLEANFILES = $(TEST_PROG_CHKEXE:.chkexe_=.chkexe)                    \
        $(TEST_PROG_PARA_CHKEXE:.chkexe_=.log)                           \
        *.chksh *.logsh

-MOSTLYCLEANFILES = $(CHECK_CLEANFILES)
 INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/test -I$(top_srcdir)/tools/lib
@BUILD_PARALLEL_CONDITIONAL_TRUE@TEST_PROG_PARA = h5perf

@ -613,7 +612,6 @@ install-strip:
 	  `test -z '$(STRIP)' || \
 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
-	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)

 clean-generic:
 	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
@ -663,7 +661,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

@ -685,8 +683,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.
@ -727,6 +725,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.
--- a/src/Makefile.am
+++ b/src/Makefile.am
@ -34,7 +34,7 @@ lib_LTLIBRARIES=libhdf5.la
 libhdf5_la_LDFLAGS= -version-info $(LT_VERS_INTERFACE):$(LT_VERS_REVISION):$(LT_VERS_AGE)

 # Temporary files
-MOSTLYCLEANFILES+=H5detect.o H5detect.lo H5detect H5Tinit.o H5Tinit.lo H5Tinit.c
+MOSTLYCLEANFILES=H5detect.o H5detect.lo H5detect H5Tinit.o H5Tinit.lo H5Tinit.c

 # libhdf5.settings is generated during configure. Remove it when distclean.
 DISTCLEAN=libhdf5.settings
--- a/src/Makefile.in
+++ b/src/Makefile.in
@ -353,10 +353,6 @@ CHECK_CLEANFILES = $(TEST_PROG_CHKEXE:.chkexe_=.chkexe)                    \
        *.chksh *.logsh


-# Temporary files
-MOSTLYCLEANFILES = $(CHECK_CLEANFILES) H5detect.o H5detect.lo H5detect \
-	H5Tinit.o H5Tinit.lo H5Tinit.c
-
 # Add libtool shared library version numbers to the HDF5 library
 # See libtool versioning documentation online.
 LT_VERS_INTERFACE = 2
@ -370,6 +366,9 @@ lib_LTLIBRARIES = libhdf5.la
 # Add libtool numbers to the HDF5 library (from config/lt_vers.am)
 libhdf5_la_LDFLAGS = -version-info $(LT_VERS_INTERFACE):$(LT_VERS_REVISION):$(LT_VERS_AGE)

+# Temporary files
+MOSTLYCLEANFILES = H5detect.o H5detect.lo H5detect H5Tinit.o H5Tinit.lo H5Tinit.c
+
 # libhdf5.settings is generated during configure. Remove it when distclean.
 DISTCLEAN = libhdf5.settings

@ -897,7 +896,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

@ -921,10 +920,10 @@ uninstall-am: uninstall-includeHEADERS uninstall-info-am \
 	install-settingsDATA 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-includeHEADERS \
-	uninstall-info-am uninstall-libLTLIBRARIES \
-	uninstall-settingsDATA
+	mostlyclean-generic mostlyclean-libtool mostlyclean-local pdf \
+	pdf-am ps ps-am tags uninstall uninstall-am \
+	uninstall-includeHEADERS uninstall-info-am \
+	uninstall-libLTLIBRARIES uninstall-settingsDATA


 # check-install is a synonym for installcheck.
@ -985,6 +984,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.
--- a/test/Makefile.am
+++ b/test/Makefile.am
@ -46,7 +46,7 @@ TEST_PROG=testhdf5 lheap ohdr stab gheap btree2 cache b+tree blocktrack sheap \
 check_PROGRAMS=$(TEST_PROG) error_test err_compat testmeta


-# The libh5test.a library provides common support code for the tests.
+# The libh5test library provides common support code for the tests.
 check_LTLIBRARIES=libh5test.la
 libh5test_la_SOURCES=h5test.c testframe.c
 libh5test_la_LIBADD=$(LIBHDF5)
@ -81,7 +81,7 @@ flush2.chkexe_: flush1.chkexe_
 # specifying a file prefix or low-level driver.  Changing the file
 # prefix or low-level driver with environment variables will influence 
 # the temporary file name in ways that the makefile is not aware of.
-MOSTLYCLEANFILES+=cmpd_dset.h5 compact_dataset.h5 dataset.h5 extend.h5 istore.h5\
+CHECK_CLEANFILES+=cmpd_dset.h5 compact_dataset.h5 dataset.h5 extend.h5 istore.h5\
            tfile[1-4].h5 th5s[1-3].h5 lheap.h5 ohdr.h5 stab[1-2].h5 \
            extern_[1-3].h5 extern_[1-4][ab].raw gheap[0-4].h5 dt_arith[1-2]\
            links.h5 links[1-3].h5 big.data big[0-9][0-9][0-9][0-9][0-9].h5  \
--- a/test/Makefile.in
+++ b/test/Makefile.in
@ -499,28 +499,26 @@ 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
-

 # Temporary files.  These files are the ones created by setting the
 # HDF5_NOCLEANUP environment variable and running `make test' without
 # specifying a file prefix or low-level driver.  Changing the file
 # prefix or low-level driver with environment variables will influence 
 # the temporary file name in ways that the makefile is not aware of.
-MOSTLYCLEANFILES = $(CHECK_CLEANFILES) cmpd_dset.h5 compact_dataset.h5 \
-	dataset.h5 extend.h5 istore.h5 tfile[1-4].h5 th5s[1-3].h5 \
-	lheap.h5 ohdr.h5 stab[1-2].h5 extern_[1-3].h5 \
-	extern_[1-4][ab].raw gheap[0-4].h5 dt_arith[1-2] links.h5 \
-	links[1-3].h5 big.data big[0-9][0-9][0-9][0-9][0-9].h5 \
-	dtypes[1-8].h5 dt_arith[1-2].h5 tattr.h5 tselect.h5 mtime.h5 \
-	unlink.h5 unicode.h5 fillval_[0-9].h5 fillval.raw \
-	mount_[0-9].h5 testmeta.h5 ttime.h5 trefer[1-3].h5 tvltypes.h5 \
-	tvlstr.h5 tvlstr2.h5 flush.h5 enum1.h5 titerate.h5 ttsafe.h5 \
-	tarray1.h5 tgenprop.h5 tmisc[0-9]*.h5 set_extent_read.h5 \
+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 \
+	cmpd_dset.h5 compact_dataset.h5 dataset.h5 extend.h5 istore.h5 \
+	tfile[1-4].h5 th5s[1-3].h5 lheap.h5 ohdr.h5 stab[1-2].h5 \
+	extern_[1-3].h5 extern_[1-4][ab].raw gheap[0-4].h5 \
+	dt_arith[1-2] links.h5 links[1-3].h5 big.data \
+	big[0-9][0-9][0-9][0-9][0-9].h5 dtypes[1-8].h5 \
+	dt_arith[1-2].h5 tattr.h5 tselect.h5 mtime.h5 unlink.h5 \
+	unicode.h5 fillval_[0-9].h5 fillval.raw mount_[0-9].h5 \
+	testmeta.h5 ttime.h5 trefer[1-3].h5 tvltypes.h5 tvlstr.h5 \
+	tvlstr2.h5 flush.h5 enum1.h5 titerate.h5 ttsafe.h5 tarray1.h5 \
+	tgenprop.h5 tmisc[0-9]*.h5 set_extent_read.h5 \
 	set_extent_create.h5 getname.h5 getname[1-3].h5 sec2_file.h5 \
 	family_file000[0-3][0-9].h5 multi_file-[rs].h5 core_file \
 	new_move_[ab].h5 ntypes.h5 dangle.h5 error_test.h5 \
@ -545,7 +543,7 @@ TEST_PROG = testhdf5 lheap ohdr stab gheap btree2 cache b+tree blocktrack sheap
           getname vfd ntypes dangle dtransform reserved 


-# The libh5test.a library provides common support code for the tests.
+# The libh5test library provides common support code for the tests.
 check_LTLIBRARIES = libh5test.la
 libh5test_la_SOURCES = h5test.c testframe.c
 libh5test_la_LIBADD = $(LIBHDF5)
@ -963,7 +961,6 @@ install-strip:
 	  `test -z '$(STRIP)' || \
 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
-	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)

 clean-generic:

@ -1012,7 +1009,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

@ -1033,8 +1030,8 @@ uninstall-am: uninstall-info-am
 	install-info install-info-am install-man 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-info-am
+	mostlyclean-generic mostlyclean-libtool mostlyclean-local pdf \
+	pdf-am ps ps-am tags uninstall uninstall-am uninstall-info-am


 # check-install is a synonym for installcheck.
@ -1087,6 +1084,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.
--- a/testpar/Makefile.am
+++ b/testpar/Makefile.am
@ -40,7 +40,8 @@ LDADD = $(LIBHDF5) $(LIBH5TEST)
 # MPItest.h5 is from t_mpi
 # Para*.h5 are from testphdf
 # *.clog are from MPE option
-MOSTLYCLEANFILES+=MPItest.h5 Para*.h5 *.clog
+CHECK_CLEANFILES+=MPItest.h5 Para*.h5
+MOSTLYCLEANFILES=*.clog
 DISTCLEANFILES=go Makefile testph5.sh

 include $(top_srcdir)/config/conclude.am
--- a/testpar/Makefile.in
+++ b/testpar/Makefile.in
@ -312,18 +312,16 @@ 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
-

 # Temporary files
 # MPItest.h5 is from t_mpi
 # Para*.h5 are from testphdf
 # *.clog are from MPE option
-MOSTLYCLEANFILES = $(CHECK_CLEANFILES) MPItest.h5 Para*.h5 *.clog
+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 \
+	MPItest.h5 Para*.h5
 INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/test

 # Test programs and scripts.  These are our main targets.
@ -337,6 +335,7 @@ testphdf5_SOURCES = testphdf5.c t_dset.c t_file.c t_mdset.c t_ph5basic.c \

 # The tests all depend on the hdf5 library and the test library
 LDADD = $(LIBHDF5) $(LIBH5TEST)
+MOSTLYCLEANFILES = *.clog
 DISTCLEANFILES = go Makefile testph5.sh

 # Automake needs to be taught how to build lib, progs, and tests targets.
@ -601,7 +600,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

@ -622,8 +621,8 @@ uninstall-am: uninstall-info-am
 	install-info-am install-man 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-info-am
+	mostlyclean-generic mostlyclean-libtool mostlyclean-local pdf \
+	pdf-am ps ps-am tags uninstall uninstall-am uninstall-info-am


 # check-install is a synonym for installcheck.
@ -664,6 +663,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.
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@ -294,7 +294,6 @@ CHECK_CLEANFILES = $(TEST_PROG_CHKEXE:.chkexe_=.chkexe)                    \
        $(TEST_PROG_PARA_CHKEXE:.chkexe_=.log)                           \
        *.chksh *.logsh

-MOSTLYCLEANFILES = $(CHECK_CLEANFILES)

 # All subdirectories
 SUBDIRS = lib h5dump h5diff h5ls misc gifconv h5import h5repack h5jam
@ -554,7 +553,6 @@ install-strip:
 	  `test -z '$(STRIP)' || \
 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
-	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)

 clean-generic:

@ -599,7 +597,8 @@ maintainer-clean-am: distclean-am maintainer-clean-generic

 mostlyclean: mostlyclean-recursive

-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool \
+	mostlyclean-local

 pdf: pdf-recursive

@ -623,8 +622,9 @@ uninstall-info: uninstall-info-recursive
 	install-strip installcheck installcheck-am installdirs \
 	installdirs-am maintainer-clean maintainer-clean-generic \
 	maintainer-clean-recursive mostlyclean mostlyclean-generic \
-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
-	tags tags-recursive uninstall uninstall-am uninstall-info-am
+	mostlyclean-libtool mostlyclean-local mostlyclean-recursive \
+	pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
+	uninstall-info-am


 # check-install is a synonym for installcheck.
@ -665,6 +665,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.
--- a/tools/gifconv/Makefile.in
+++ b/tools/gifconv/Makefile.in
@ -317,7 +317,6 @@ CHECK_CLEANFILES = $(TEST_PROG_CHKEXE:.chkexe_=.chkexe)                    \
        $(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
@ -556,7 +555,6 @@ install-strip:
 	  `test -z '$(STRIP)' || \
 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
-	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)

 clean-generic:

@ -604,7 +602,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

@ -625,9 +623,9 @@ uninstall-am: uninstall-binPROGRAMS uninstall-info-am
 	install-info install-info-am install-man 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-generic mostlyclean-libtool mostlyclean-local pdf \
+	pdf-am ps ps-am tags uninstall uninstall-am \
+	uninstall-binPROGRAMS uninstall-info-am


 # check-install is a synonym for installcheck.
@ -668,6 +666,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.
--- a/tools/h5diff/Makefile.am
+++ b/tools/h5diff/Makefile.am
@ -50,7 +50,7 @@ LDADD=$(LIBH5TOOLS) $(LIBHDF5)

 # Temporary files.  *.h5 are generated by h5diff.  They should
 # be copied to the testfiles/ directory if update is required
-MOSTLYCLEANFILES+=*.h5 expect_sorted actual_sorted
+CHECK_CLEANFILES+=*.h5 expect_sorted actual_sorted

 include $(top_srcdir)/config/conclude.am

--- a/tools/h5diff/Makefile.in
+++ b/tools/h5diff/Makefile.in
@ -319,17 +319,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
-

 # Temporary files.  *.h5 are generated by h5diff.  They should
 # be copied to the testfiles/ directory if update is required
-MOSTLYCLEANFILES = $(CHECK_CLEANFILES) *.h5 expect_sorted \
-	actual_sorted
+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 \
+	expect_sorted actual_sorted

 # Include src and tools/lib directories
 INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/tools/lib
@ -594,7 +591,6 @@ install-strip:
 	  `test -z '$(STRIP)' || \
 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
-	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)

 clean-generic:

@ -643,7 +639,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

@ -665,8 +661,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.
@ -707,6 +703,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.
--- a/tools/h5dump/Makefile.am
+++ b/tools/h5dump/Makefile.am
@ -37,7 +37,7 @@ LDADD=$(LIBH5TOOLS) $(LIBHDF5)

 # Temporary files.  *.h5 are generated by h5dumpgentest.  They should
 # copied to the testfiles/ directory if update is required.
-MOSTLYCLEANFILES+=*.h5
+CHECK_CLEANFILES+=*.h5
 DISTCLEANFILES=testh5dump.sh

 include $(top_srcdir)/config/conclude.am
--- a/tools/h5dump/Makefile.in
+++ b/tools/h5dump/Makefile.in
@ -312,16 +312,13 @@ 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
-

 # Temporary files.  *.h5 are generated by h5dumpgentest.  They should
 # copied to the testfiles/ directory if update is required.
-MOSTLYCLEANFILES = $(CHECK_CLEANFILES) *.h5
+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

 # Include files in /src directory and /tools/lib directory
 INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/tools/lib
@ -568,7 +565,6 @@ install-strip:
 	  `test -z '$(STRIP)' || \
 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
-	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)

 clean-generic:

@ -618,7 +614,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

@ -640,8 +636,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.
@ -682,6 +678,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.
--- a/tools/h5import/Makefile.in
+++ b/tools/h5import/Makefile.in
@ -318,7 +318,6 @@ CHECK_CLEANFILES = $(TEST_PROG_CHKEXE:.chkexe_=.chkexe)                    \
        $(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
@ -562,7 +561,6 @@ install-strip:
 	  `test -z '$(STRIP)' || \
 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
-	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)

 clean-generic:

@ -611,7 +609,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

@ -633,8 +631,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.
@ -675,6 +673,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.
--- 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
--- 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.
--- a/tools/h5ls/Makefile.in
+++ b/tools/h5ls/Makefile.in
@ -311,7 +311,6 @@ CHECK_CLEANFILES = $(TEST_PROG_CHKEXE:.chkexe_=.chkexe)                    \
        $(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
@ -543,7 +542,6 @@ install-strip:
 	  `test -z '$(STRIP)' || \
 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
-	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)

 clean-generic:

@ -591,7 +589,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

@ -612,9 +610,9 @@ uninstall-am: uninstall-binPROGRAMS uninstall-info-am
 	install-info install-info-am install-man 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-generic mostlyclean-libtool mostlyclean-local pdf \
+	pdf-am ps ps-am tags uninstall uninstall-am \
+	uninstall-binPROGRAMS uninstall-info-am


 # check-install is a synonym for installcheck.
@ -655,6 +653,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.
--- a/tools/h5repack/Makefile.am
+++ b/tools/h5repack/Makefile.am
@ -50,7 +50,7 @@ testh5repack_detect_szip_SOURCES=testh5repack_detect_szip.c

 # Temporary files.  *.h5 are generated by h5repack.  They should
 # copied to the testfiles/ directory if update is required.
-MOSTLYCLEANFILES+=*.h5
+CHECK_CLEANFILES+=*.h5
 DISTCLEANFILES=h5repack.sh

 include $(top_srcdir)/config/conclude.am
--- a/tools/h5repack/Makefile.in
+++ b/tools/h5repack/Makefile.in
@ -327,16 +327,13 @@ 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
-

 # Temporary files.  *.h5 are generated by h5repack.  They should
 # copied to the testfiles/ directory if update is required.
-MOSTLYCLEANFILES = $(CHECK_CLEANFILES) *.h5
+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

 # Include src, test, and tools/lib directories
 INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/test -I$(top_srcdir)/tools/lib
@ -617,7 +614,6 @@ install-strip:
 	  `test -z '$(STRIP)' || \
 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
-	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)

 clean-generic:

@ -667,7 +663,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

@ -689,9 +685,9 @@ uninstall-am: uninstall-binPROGRAMS uninstall-info-am
 	install-info-am install-man 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-generic mostlyclean-libtool mostlyclean-local pdf \
+	pdf-am ps ps-am tags uninstall uninstall-am \
+	uninstall-binPROGRAMS uninstall-info-am


 # check-install is a synonym for installcheck.
@ -732,6 +728,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.
--- a/tools/lib/Makefile.in
+++ b/tools/lib/Makefile.in
@ -315,7 +315,6 @@ CHECK_CLEANFILES = $(TEST_PROG_CHKEXE:.chkexe_=.chkexe)                    \
        $(TEST_PROG_PARA_CHKEXE:.chkexe_=.log)                           \
        *.chksh *.logsh

-MOSTLYCLEANFILES = $(CHECK_CLEANFILES)

 # Include files in /src directory
 INCLUDES = -I$(top_srcdir)/src
@ -560,7 +559,6 @@ install-strip:
 	  `test -z '$(STRIP)' || \
 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
-	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)

 clean-generic:

@ -609,7 +607,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

@ -630,8 +628,8 @@ uninstall-am: uninstall-info-am
 	install-info install-info-am install-man 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-info-am
+	mostlyclean-generic mostlyclean-libtool mostlyclean-local pdf \
+	pdf-am ps ps-am tags uninstall uninstall-am uninstall-info-am


 # check-install is a synonym for installcheck.
@ -672,6 +670,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.
--- a/tools/misc/Makefile.am
+++ b/tools/misc/Makefile.am
@ -44,7 +44,7 @@ CLEANFILES=h5redeploy
 # 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+=*.h5 ../testfiles/fst_family*.h5 ../testfiles/scd_family*.h5
+CHECK_CLEANFILES+=*.h5 ../testfiles/fst_family*.h5 ../testfiles/scd_family*.h5

 # These were generated by configure.  Remove them only when distclean.
 DISTCLEANFILES=h5cc testh5repart.sh
--- a/tools/misc/Makefile.in
+++ b/tools/misc/Makefile.in
@ -332,17 +332,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
-

 # 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 = $(CHECK_CLEANFILES) *.h5 \
+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 \
 	../testfiles/fst_family*.h5 ../testfiles/scd_family*.h5

 # Include src directory
@ -637,7 +634,6 @@ install-strip:
 	  `test -z '$(STRIP)' || \
 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
-	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)

 clean-generic:
 	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
@ -689,7 +685,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

@ -713,9 +709,9 @@ uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \
 	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-binSCRIPTS uninstall-info-am \
-	uninstall-local
+	mostlyclean-local pdf pdf-am ps ps-am tags uninstall \
+	uninstall-am uninstall-binPROGRAMS uninstall-binSCRIPTS \
+	uninstall-info-am uninstall-local


 # check-install is a synonym for installcheck.
@ -765,6 +761,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.