[svn-r11179] Purpose:

Feature: check-clean target

Description:
'make check-clean' cleans up output files from tests.

Solution:
Tests create foo.chkexe and foo.log files.  Scripts create foo.chksh and
foo.logsh files.  'make check-clean' will clean these files up so that
the tests can be re-run.
Also suppressed some not-very-useful output of Makefiles when it would
echo commands.

Platforms tested:
mir, sleipnir, modi4

Misc. update:

2 files changed, 18 insertions, 15 deletions

diff --git a/hl/fortran/src/Makefile.am b/hl/fortran/src/Makefile.am
index 1462fbb..14076e7 100644
--- a/hl/fortran/src/Makefile.am
+++ b/hl/fortran/src/Makefile.am
@@ -29,8 +29,6 @@ lib_LTLIBRARIES=libhdf5hl_fortran.la
 libhdf5hl_fortran_la_SOURCES=H5LTfc.c  H5IMfc.c H5IMcc.c H5TBfc.c H5LTff.f90  \
                 H5IMff.f90 H5TBff.f90 
 
-#libhdf5hl_fortran_la_LIBADD=$(LIBH5_HL)
-
 # Fortran module files can have different extensions and different names
 # (e.g., different capitalizations) on different platforms.  Write rules
 # for them explicitly rather than trying to teach automake about them.
@@ -38,17 +36,17 @@ libhdf5hl_fortran_la_SOURCES=H5LTfc.c  H5IMfc.c H5IMcc.c H5TBfc.c H5LTff.f90  \
 maintainer-clean-local: clean-local
 distclean-local: clean-local
 clean-local:
-	if test -n "$(F9XMODEXT)" && test "X$(F9XMODEXT)" != "Xo"; then \
+	@if test -n "$(F9XMODEXT)" && test "X$(F9XMODEXT)" != "Xo"; then \
 	  $(RM) *.$(F9XMODEXT);                                         \
 	fi
 
 install-data-local:
-	if test -n "$(F9XMODEXT)" && test "X$(F9XMODEXT)" != "Xo"; then \
+	@if test -n "$(F9XMODEXT)" && test "X$(F9XMODEXT)" != "Xo"; then \
 	  $(CP) $(top_builddir)/$(subdir)/*.$(F9XMODEXT) $(includedir)/. ; \
 	fi
 
 uninstall-local:
-	if test -n "$(F9XMODEXT)" -a "X$(F9XMODEXT)" != "Xo"; then      \
+	@if test -n "$(F9XMODEXT)" -a "X$(F9XMODEXT)" != "Xo"; then      \
 	  if test -f "$(includedir)/hdf5.$(F9XMODEXT)" -o -f "$(includedir)/HDF5.$(F9XMODEXT)"; then \
 	    set -x; $(RM) $(includedir)/*.$(F9XMODEXT);                 \
 	  fi;                                                           \
diff --git a/hl/fortran/src/Makefile.in b/hl/fortran/src/Makefile.in
index e945d4e..409bb03 100644
--- a/hl/fortran/src/Makefile.in
+++ b/hl/fortran/src/Makefile.in
@@ -301,13 +301,16 @@ H5FC_PP = $(bindir)/h5pfc
 # Serial tests create .log and .logsh files.  It's important only to clean log
 # files generated by HDF5's tests, because the .log suffix is used for
 # other files (e.g., config.log)!
-MOSTLYCLEANFILES = $(TEST_PROG_CHKEXE:.chkexe_=.chkexe)                    \
+# On the other hand, it is very hard to specify the exact name of .chksh and
+# .logsh files because some scripts live in the source tree, not the build
+# tree.  Thus, we clean all .logsh and .chksh files.
+CHECK_CLEANFILES = $(TEST_PROG_CHKEXE:.chkexe_=.chkexe)                    \
         $(TEST_PROG_PARA_CHKEXE:.chkexe_=.chkexe)                        \
-        $(TEST_SCRIPT_CHKSH:.chksh_=.chksh)                              \
-        $(TEST_SCRIPT_PARA_CHKSH:.chksh_=.chksh)                         \
         $(TEST_PROG_CHKEXE:.chkexe_=.log)                                \
-        $(TEST_SCRIPT_CHKSH:.chksh_=.logsh)
+        $(TEST_PROG_PARA_CHKEXE:.chkexe_=.log)                           \
+        *.chksh *.logsh
 
+MOSTLYCLEANFILES = $(CHECK_CLEANFILES)
 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
 
@@ -641,8 +644,6 @@ uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES \
 # as well.
 check-install: installcheck
 
-#libhdf5hl_fortran_la_LIBADD=$(LIBH5_HL)
-
 # Fortran module files can have different extensions and different names
 # (e.g., different capitalizations) on different platforms.  Write rules
 # for them explicitly rather than trying to teach automake about them.
@@ -650,17 +651,17 @@ check-install: installcheck
 maintainer-clean-local: clean-local
 distclean-local: clean-local
 clean-local:
-	if test -n "$(F9XMODEXT)" && test "X$(F9XMODEXT)" != "Xo"; then \
+	@if test -n "$(F9XMODEXT)" && test "X$(F9XMODEXT)" != "Xo"; then \
 	  $(RM) *.$(F9XMODEXT);                                         \
 	fi
 
 install-data-local:
-	if test -n "$(F9XMODEXT)" && test "X$(F9XMODEXT)" != "Xo"; then \
+	@if test -n "$(F9XMODEXT)" && test "X$(F9XMODEXT)" != "Xo"; then \
 	  $(CP) $(top_builddir)/$(subdir)/*.$(F9XMODEXT) $(includedir)/. ; \
 	fi
 
 uninstall-local:
-	if test -n "$(F9XMODEXT)" -a "X$(F9XMODEXT)" != "Xo"; then      \
+	@if test -n "$(F9XMODEXT)" -a "X$(F9XMODEXT)" != "Xo"; then      \
 	  if test -f "$(includedir)/hdf5.$(F9XMODEXT)" -o -f "$(includedir)/HDF5.$(F9XMODEXT)"; then \
 	    set -x; $(RM) $(includedir)/*.$(F9XMODEXT);                 \
 	  fi;                                                           \
@@ -682,7 +683,7 @@ build-lib: $(BUILT_SOURCES) $(LIB)
 build-progs: $(BUILT_SOURCES) $(LIB) $(PROGS)
 build-tests: $(BUILT_SOURCES) $(LIB) $(PROGS) $(TESTS)
 
-lib progs tests check-s check-p ::
+lib progs tests check-s check-p check-clean ::
 	@$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1;
 	@for d in X $(SUBDIRS); do                                             \
 	    if test $$d != X && test $$d != .; then                           \
@@ -702,6 +703,10 @@ all-local: $(EXTRA_LIB) $(EXTRA_PROG) $(TESTS)
 install-doc uninstall-doc:
 	@echo "Nothing to be done."
 
+# clean up files generated by tests so they can be re-run.
+build-check-clean:
+	$(RM) $(CHECK_CLEANFILES)
+
 # Run each test in order, passing $(TEST_FLAGS) to the program.
 # Since tests are done in a shell loop, "make -i" does apply inside it.
 # Set HDF5_Make_Ignore to a non-blank string to ignore errors inside the loop.