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

9 files changed, 56 insertions, 46 deletions

diff --git a/fortran/Makefile.in b/fortran/Makefile.in
index b2da807..5a82a61 100644
--- 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.
diff --git a/fortran/examples/Makefile.am b/fortran/examples/Makefile.am
index 09fe83c..389d15d 100644
--- 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
diff --git a/fortran/examples/Makefile.in b/fortran/examples/Makefile.in
index df2a7fb..6b8e0c8 100644
--- 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.
diff --git a/fortran/src/Makefile.am b/fortran/src/Makefile.am
index 093ca5c..481eb89 100644
--- 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
diff --git a/fortran/src/Makefile.in b/fortran/src/Makefile.in
index df3d66c..2a9f34a 100644
--- 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.
diff --git a/fortran/test/Makefile.am b/fortran/test/Makefile.am
index 6ecee2f..e5ad3bf 100644
--- 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)
diff --git a/fortran/test/Makefile.in b/fortran/test/Makefile.in
index 66dad14..291231f 100644
--- 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.
diff --git a/fortran/testpar/Makefile.am b/fortran/testpar/Makefile.am
index 30cf60b..af9461e 100644
--- 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
diff --git a/fortran/testpar/Makefile.in b/fortran/testpar/Makefile.in
index 4c0ebd7..743a7ff 100644
--- 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.