[svn-r12143] Purpose:

Bug fix

Description:
make check-clean didn't clean results of example tests

Solution:
Fixed Makefiles so that check-clean recurses into example directories.
Also a little Makefile cleanup.

Platforms tested:
mir, modi4, heping, copper

5 files changed, 34 insertions, 8 deletions

diff --git a/hl/c++/Makefile.am b/hl/c++/Makefile.am
index e19cab2..563d4ae 100644
--- a/hl/c++/Makefile.am
+++ b/hl/c++/Makefile.am
@@ -26,11 +26,16 @@ DIST_SUBDIRS=src test examples
 install-examples uninstall-examples:
 	@(cd examples && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;
 
-# Check that examples can be successfully built
-check-install:
-	@$(MAKE) $(AM_MAKEFLAGS) installcheck
-
 installcheck-local:
 	@(cd examples && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;
 
+# Clean examples when check-clean is invoked
+check-clean ::
+	@$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1;
+	@for d in X $(SUBDIRS) examples; do                                   \
+	    if test $$d != X && test $$d != .; then                           \
+	        (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;     \
+	    fi;                                                               \
+	done
+
 include $(top_srcdir)/config/conclude.am
diff --git a/hl/c++/Makefile.in b/hl/c++/Makefile.in
index 5f37302..e1d8ceb 100644
--- a/hl/c++/Makefile.in
+++ b/hl/c++/Makefile.in
@@ -660,13 +660,18 @@ check-install: installcheck
 install-examples uninstall-examples:
 	@(cd examples && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;
 
-# Check that examples can be successfully built
-check-install:
-	@$(MAKE) $(AM_MAKEFLAGS) installcheck
-
 installcheck-local:
 	@(cd examples && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;
 
+# Clean examples when check-clean is invoked
+check-clean ::
+	@$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1;
+	@for d in X $(SUBDIRS) examples; do                                   \
+	    if test $$d != X && test $$d != .; then                           \
+	        (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;     \
+	    fi;                                                               \
+	done
+
 # lib/progs/tests targets recurse into subdirectories. build-* targets
 # build files in this directory.
 build-lib: $(LIB)
@@ -693,6 +698,7 @@ check-clean ::
 	        (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;     \
 	    fi;                                                               \
 	done
+
 # Tell Automake to build tests when the user types `make all' (this is
 # not its default behavior).  Also build EXTRA_LIB and EXTRA_PROG since
 # Automake won't build them automatically, either.
@@ -712,6 +718,9 @@ build-check-clean:
 # run check-clean whenever mostlyclean is run
 mostlyclean-local: build-check-clean
 
+# check-install is just a synonym for installcheck
+	@$(MAKE) $(AM_MAKEFLAGS) installcheck
+
 # 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/hl/c++/examples/Makefile.in b/hl/c++/examples/Makefile.in
index b011b3c..25885bd 100644
--- a/hl/c++/examples/Makefile.in
+++ b/hl/c++/examples/Makefile.in
@@ -591,6 +591,7 @@ check-clean ::
 	        (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;     \
 	    fi;                                                               \
 	done
+
 # Tell Automake to build tests when the user types `make all' (this is
 # not its default behavior).  Also build EXTRA_LIB and EXTRA_PROG since
 # Automake won't build them automatically, either.
@@ -610,6 +611,9 @@ build-check-clean:
 # run check-clean whenever mostlyclean is run
 mostlyclean-local: build-check-clean
 
+# check-install is just a synonym for installcheck
+	@$(MAKE) $(AM_MAKEFLAGS) installcheck
+
 # 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/hl/c++/src/Makefile.in b/hl/c++/src/Makefile.in
index ecb35ad..dae8515 100644
--- a/hl/c++/src/Makefile.in
+++ b/hl/c++/src/Makefile.in
@@ -701,6 +701,7 @@ check-clean ::
 	        (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;     \
 	    fi;                                                               \
 	done
+
 # Tell Automake to build tests when the user types `make all' (this is
 # not its default behavior).  Also build EXTRA_LIB and EXTRA_PROG since
 # Automake won't build them automatically, either.
@@ -720,6 +721,9 @@ build-check-clean:
 # run check-clean whenever mostlyclean is run
 mostlyclean-local: build-check-clean
 
+# check-install is just a synonym for installcheck
+	@$(MAKE) $(AM_MAKEFLAGS) installcheck
+
 # 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/hl/c++/test/Makefile.in b/hl/c++/test/Makefile.in
index e61a284..c98a2e9 100644
--- a/hl/c++/test/Makefile.in
+++ b/hl/c++/test/Makefile.in
@@ -651,6 +651,7 @@ check-clean ::
 	        (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;     \
 	    fi;                                                               \
 	done
+
 # Tell Automake to build tests when the user types `make all' (this is
 # not its default behavior).  Also build EXTRA_LIB and EXTRA_PROG since
 # Automake won't build them automatically, either.
@@ -670,6 +671,9 @@ build-check-clean:
 # run check-clean whenever mostlyclean is run
 mostlyclean-local: build-check-clean
 
+# check-install is just a synonym for installcheck
+	@$(MAKE) $(AM_MAKEFLAGS) installcheck
+
 # 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.