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

2 files changed, 14 insertions, 10 deletions

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.