[svn-r10858] Purpose:

bug fix.

Description:
The check-s and check-p targets are not recursively passes down.
Make them so.

Platforms tested:
heping (serial and pp).

10 files changed, 150 insertions, 40 deletions

diff --git a/hl/Makefile.in b/hl/Makefile.in
index 64dde96..d72d912 100755
--- a/hl/Makefile.in
+++ b/hl/Makefile.in
@@ -637,10 +637,20 @@ install-doc uninstall-doc:
 check-TESTS: test
 
 test _test:
-	$(MAKE) check-s
-	$(MAKE) check-p
+	$(MAKE) _check-s
+	$(MAKE) _check-p
 
-check-s: $(LIB) $(PROGS) $(TESTS)
+# Run check-s/check-p recursively down SUBDIRS
+check-s check-p:
+	@$(MAKE) $(AM_MAKEFLAGS) _$@ || exit 1;                          \
+	for d in X $(SUBDIRS); do                                             \
+	    if test $$d != X -a $$d != .; then                                \
+	        (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;     \
+	    fi;                                                               \
+	done
+
+# Actual execution of check-s.
+_check-s: $(LIB) $(PROGS) $(TESTS)
 	@if test -n "$(TEST_PROG)$(TEST_SCRIPT)"; then      \
 	   echo "===Serial tests in `echo ${PWD} | sed -e s:.*/::` begin `date`==="; \
         fi
@@ -687,7 +697,8 @@ check-s: $(LIB) $(PROGS) $(TESTS)
 	    echo "===Serial tests in `echo ${PWD} | sed -e s:.*/::` ended `date`===";\
 	fi
 
-check-p: $(LIB) $(PROGS) $(TESTS)
+# Actual execution of check-p.
+_check-p: $(LIB) $(PROGS) $(TESTS)
 	@if test -n "$(TEST_PROG_PARA)$(TEST_SCRIPT_PARA)"; then      \
 	   echo "===Parallel tests in `echo ${PWD} | sed -e s:.*/::` begin `date`==="; \
         fi
diff --git a/hl/c++/Makefile.in b/hl/c++/Makefile.in
index 9386f45..83e5769 100644
--- a/hl/c++/Makefile.in
+++ b/hl/c++/Makefile.in
@@ -640,10 +640,20 @@ install-doc uninstall-doc:
 check-TESTS: test
 
 test _test:
-	$(MAKE) check-s
-	$(MAKE) check-p
+	$(MAKE) _check-s
+	$(MAKE) _check-p
 
-check-s: $(LIB) $(PROGS) $(TESTS)
+# Run check-s/check-p recursively down SUBDIRS
+check-s check-p:
+	@$(MAKE) $(AM_MAKEFLAGS) _$@ || exit 1;                          \
+	for d in X $(SUBDIRS); do                                             \
+	    if test $$d != X -a $$d != .; then                                \
+	        (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;     \
+	    fi;                                                               \
+	done
+
+# Actual execution of check-s.
+_check-s: $(LIB) $(PROGS) $(TESTS)
 	@if test -n "$(TEST_PROG)$(TEST_SCRIPT)"; then      \
 	   echo "===Serial tests in `echo ${PWD} | sed -e s:.*/::` begin `date`==="; \
         fi
@@ -690,7 +700,8 @@ check-s: $(LIB) $(PROGS) $(TESTS)
 	    echo "===Serial tests in `echo ${PWD} | sed -e s:.*/::` ended `date`===";\
 	fi
 
-check-p: $(LIB) $(PROGS) $(TESTS)
+# Actual execution of check-p.
+_check-p: $(LIB) $(PROGS) $(TESTS)
 	@if test -n "$(TEST_PROG_PARA)$(TEST_SCRIPT_PARA)"; then      \
 	   echo "===Parallel tests in `echo ${PWD} | sed -e s:.*/::` begin `date`==="; \
         fi
diff --git a/hl/c++/src/Makefile.in b/hl/c++/src/Makefile.in
index 84fd373..2e5ff5e 100644
--- a/hl/c++/src/Makefile.in
+++ b/hl/c++/src/Makefile.in
@@ -662,10 +662,20 @@ install-doc uninstall-doc:
 check-TESTS: test
 
 test _test:
-	$(MAKE) check-s
-	$(MAKE) check-p
+	$(MAKE) _check-s
+	$(MAKE) _check-p
 
-check-s: $(LIB) $(PROGS) $(TESTS)
+# Run check-s/check-p recursively down SUBDIRS
+check-s check-p:
+	@$(MAKE) $(AM_MAKEFLAGS) _$@ || exit 1;                          \
+	for d in X $(SUBDIRS); do                                             \
+	    if test $$d != X -a $$d != .; then                                \
+	        (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;     \
+	    fi;                                                               \
+	done
+
+# Actual execution of check-s.
+_check-s: $(LIB) $(PROGS) $(TESTS)
 	@if test -n "$(TEST_PROG)$(TEST_SCRIPT)"; then      \
 	   echo "===Serial tests in `echo ${PWD} | sed -e s:.*/::` begin `date`==="; \
         fi
@@ -712,7 +722,8 @@ check-s: $(LIB) $(PROGS) $(TESTS)
 	    echo "===Serial tests in `echo ${PWD} | sed -e s:.*/::` ended `date`===";\
 	fi
 
-check-p: $(LIB) $(PROGS) $(TESTS)
+# Actual execution of check-p.
+_check-p: $(LIB) $(PROGS) $(TESTS)
 	@if test -n "$(TEST_PROG_PARA)$(TEST_SCRIPT_PARA)"; then      \
 	   echo "===Parallel tests in `echo ${PWD} | sed -e s:.*/::` begin `date`==="; \
         fi
diff --git a/hl/c++/test/Makefile.in b/hl/c++/test/Makefile.in
index 958858e..2e53a5d 100644
--- a/hl/c++/test/Makefile.in
+++ b/hl/c++/test/Makefile.in
@@ -611,10 +611,20 @@ install-doc uninstall-doc:
 check-TESTS: test
 
 test _test:
-	$(MAKE) check-s
-	$(MAKE) check-p
+	$(MAKE) _check-s
+	$(MAKE) _check-p
 
-check-s: $(LIB) $(PROGS) $(TESTS)
+# Run check-s/check-p recursively down SUBDIRS
+check-s check-p:
+	@$(MAKE) $(AM_MAKEFLAGS) _$@ || exit 1;                          \
+	for d in X $(SUBDIRS); do                                             \
+	    if test $$d != X -a $$d != .; then                                \
+	        (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;     \
+	    fi;                                                               \
+	done
+
+# Actual execution of check-s.
+_check-s: $(LIB) $(PROGS) $(TESTS)
 	@if test -n "$(TEST_PROG)$(TEST_SCRIPT)"; then      \
 	   echo "===Serial tests in `echo ${PWD} | sed -e s:.*/::` begin `date`==="; \
         fi
@@ -661,7 +671,8 @@ check-s: $(LIB) $(PROGS) $(TESTS)
 	    echo "===Serial tests in `echo ${PWD} | sed -e s:.*/::` ended `date`===";\
 	fi
 
-check-p: $(LIB) $(PROGS) $(TESTS)
+# Actual execution of check-p.
+_check-p: $(LIB) $(PROGS) $(TESTS)
 	@if test -n "$(TEST_PROG_PARA)$(TEST_SCRIPT_PARA)"; then      \
 	   echo "===Parallel tests in `echo ${PWD} | sed -e s:.*/::` begin `date`==="; \
         fi
diff --git a/hl/fortran/Makefile.in b/hl/fortran/Makefile.in
index 4345211..d5041b0 100644
--- a/hl/fortran/Makefile.in
+++ b/hl/fortran/Makefile.in
@@ -635,10 +635,20 @@ install-doc uninstall-doc:
 check-TESTS: test
 
 test _test:
-	$(MAKE) check-s
-	$(MAKE) check-p
+	$(MAKE) _check-s
+	$(MAKE) _check-p
 
-check-s: $(LIB) $(PROGS) $(TESTS)
+# Run check-s/check-p recursively down SUBDIRS
+check-s check-p:
+	@$(MAKE) $(AM_MAKEFLAGS) _$@ || exit 1;                          \
+	for d in X $(SUBDIRS); do                                             \
+	    if test $$d != X -a $$d != .; then                                \
+	        (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;     \
+	    fi;                                                               \
+	done
+
+# Actual execution of check-s.
+_check-s: $(LIB) $(PROGS) $(TESTS)
 	@if test -n "$(TEST_PROG)$(TEST_SCRIPT)"; then      \
 	   echo "===Serial tests in `echo ${PWD} | sed -e s:.*/::` begin `date`==="; \
         fi
@@ -685,7 +695,8 @@ check-s: $(LIB) $(PROGS) $(TESTS)
 	    echo "===Serial tests in `echo ${PWD} | sed -e s:.*/::` ended `date`===";\
 	fi
 
-check-p: $(LIB) $(PROGS) $(TESTS)
+# Actual execution of check-p.
+_check-p: $(LIB) $(PROGS) $(TESTS)
 	@if test -n "$(TEST_PROG_PARA)$(TEST_SCRIPT_PARA)"; then      \
 	   echo "===Parallel tests in `echo ${PWD} | sed -e s:.*/::` begin `date`==="; \
         fi
diff --git a/hl/fortran/src/Makefile.in b/hl/fortran/src/Makefile.in
index 1cfe525..a7ee379 100644
--- a/hl/fortran/src/Makefile.in
+++ b/hl/fortran/src/Makefile.in
@@ -683,10 +683,20 @@ install-doc uninstall-doc:
 check-TESTS: test
 
 test _test:
-	$(MAKE) check-s
-	$(MAKE) check-p
+	$(MAKE) _check-s
+	$(MAKE) _check-p
 
-check-s: $(LIB) $(PROGS) $(TESTS)
+# Run check-s/check-p recursively down SUBDIRS
+check-s check-p:
+	@$(MAKE) $(AM_MAKEFLAGS) _$@ || exit 1;                          \
+	for d in X $(SUBDIRS); do                                             \
+	    if test $$d != X -a $$d != .; then                                \
+	        (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;     \
+	    fi;                                                               \
+	done
+
+# Actual execution of check-s.
+_check-s: $(LIB) $(PROGS) $(TESTS)
 	@if test -n "$(TEST_PROG)$(TEST_SCRIPT)"; then      \
 	   echo "===Serial tests in `echo ${PWD} | sed -e s:.*/::` begin `date`==="; \
         fi
@@ -733,7 +743,8 @@ check-s: $(LIB) $(PROGS) $(TESTS)
 	    echo "===Serial tests in `echo ${PWD} | sed -e s:.*/::` ended `date`===";\
 	fi
 
-check-p: $(LIB) $(PROGS) $(TESTS)
+# Actual execution of check-p.
+_check-p: $(LIB) $(PROGS) $(TESTS)
 	@if test -n "$(TEST_PROG_PARA)$(TEST_SCRIPT_PARA)"; then      \
 	   echo "===Parallel tests in `echo ${PWD} | sed -e s:.*/::` begin `date`==="; \
         fi
diff --git a/hl/fortran/test/Makefile.in b/hl/fortran/test/Makefile.in
index bd1ada0..a6bb76a 100644
--- a/hl/fortran/test/Makefile.in
+++ b/hl/fortran/test/Makefile.in
@@ -604,10 +604,20 @@ install-doc uninstall-doc:
 check-TESTS: test
 
 test _test:
-	$(MAKE) check-s
-	$(MAKE) check-p
+	$(MAKE) _check-s
+	$(MAKE) _check-p
 
-check-s: $(LIB) $(PROGS) $(TESTS)
+# Run check-s/check-p recursively down SUBDIRS
+check-s check-p:
+	@$(MAKE) $(AM_MAKEFLAGS) _$@ || exit 1;                          \
+	for d in X $(SUBDIRS); do                                             \
+	    if test $$d != X -a $$d != .; then                                \
+	        (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;     \
+	    fi;                                                               \
+	done
+
+# Actual execution of check-s.
+_check-s: $(LIB) $(PROGS) $(TESTS)
 	@if test -n "$(TEST_PROG)$(TEST_SCRIPT)"; then      \
 	   echo "===Serial tests in `echo ${PWD} | sed -e s:.*/::` begin `date`==="; \
         fi
@@ -654,7 +664,8 @@ check-s: $(LIB) $(PROGS) $(TESTS)
 	    echo "===Serial tests in `echo ${PWD} | sed -e s:.*/::` ended `date`===";\
 	fi
 
-check-p: $(LIB) $(PROGS) $(TESTS)
+# Actual execution of check-p.
+_check-p: $(LIB) $(PROGS) $(TESTS)
 	@if test -n "$(TEST_PROG_PARA)$(TEST_SCRIPT_PARA)"; then      \
 	   echo "===Parallel tests in `echo ${PWD} | sed -e s:.*/::` begin `date`==="; \
         fi
diff --git a/hl/src/Makefile.in b/hl/src/Makefile.in
index ac3a8ac..54e9e0e 100644
--- a/hl/src/Makefile.in
+++ b/hl/src/Makefile.in
@@ -650,10 +650,20 @@ install-doc uninstall-doc:
 check-TESTS: test
 
 test _test:
-	$(MAKE) check-s
-	$(MAKE) check-p
+	$(MAKE) _check-s
+	$(MAKE) _check-p
 
-check-s: $(LIB) $(PROGS) $(TESTS)
+# Run check-s/check-p recursively down SUBDIRS
+check-s check-p:
+	@$(MAKE) $(AM_MAKEFLAGS) _$@ || exit 1;                          \
+	for d in X $(SUBDIRS); do                                             \
+	    if test $$d != X -a $$d != .; then                                \
+	        (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;     \
+	    fi;                                                               \
+	done
+
+# Actual execution of check-s.
+_check-s: $(LIB) $(PROGS) $(TESTS)
 	@if test -n "$(TEST_PROG)$(TEST_SCRIPT)"; then      \
 	   echo "===Serial tests in `echo ${PWD} | sed -e s:.*/::` begin `date`==="; \
         fi
@@ -700,7 +710,8 @@ check-s: $(LIB) $(PROGS) $(TESTS)
 	    echo "===Serial tests in `echo ${PWD} | sed -e s:.*/::` ended `date`===";\
 	fi
 
-check-p: $(LIB) $(PROGS) $(TESTS)
+# Actual execution of check-p.
+_check-p: $(LIB) $(PROGS) $(TESTS)
 	@if test -n "$(TEST_PROG_PARA)$(TEST_SCRIPT_PARA)"; then      \
 	   echo "===Parallel tests in `echo ${PWD} | sed -e s:.*/::` begin `date`==="; \
         fi
diff --git a/hl/test/Makefile.in b/hl/test/Makefile.in
index 9da8738..728ed76 100644
--- a/hl/test/Makefile.in
+++ b/hl/test/Makefile.in
@@ -638,10 +638,20 @@ install-doc uninstall-doc:
 check-TESTS: test
 
 test _test:
-	$(MAKE) check-s
-	$(MAKE) check-p
+	$(MAKE) _check-s
+	$(MAKE) _check-p
 
-check-s: $(LIB) $(PROGS) $(TESTS)
+# Run check-s/check-p recursively down SUBDIRS
+check-s check-p:
+	@$(MAKE) $(AM_MAKEFLAGS) _$@ || exit 1;                          \
+	for d in X $(SUBDIRS); do                                             \
+	    if test $$d != X -a $$d != .; then                                \
+	        (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;     \
+	    fi;                                                               \
+	done
+
+# Actual execution of check-s.
+_check-s: $(LIB) $(PROGS) $(TESTS)
 	@if test -n "$(TEST_PROG)$(TEST_SCRIPT)"; then      \
 	   echo "===Serial tests in `echo ${PWD} | sed -e s:.*/::` begin `date`==="; \
         fi
@@ -688,7 +698,8 @@ check-s: $(LIB) $(PROGS) $(TESTS)
 	    echo "===Serial tests in `echo ${PWD} | sed -e s:.*/::` ended `date`===";\
 	fi
 
-check-p: $(LIB) $(PROGS) $(TESTS)
+# Actual execution of check-p.
+_check-p: $(LIB) $(PROGS) $(TESTS)
 	@if test -n "$(TEST_PROG_PARA)$(TEST_SCRIPT_PARA)"; then      \
 	   echo "===Parallel tests in `echo ${PWD} | sed -e s:.*/::` begin `date`==="; \
         fi
diff --git a/hl/tools/gif2h5/Makefile.in b/hl/tools/gif2h5/Makefile.in
index 3a1abea..9574696 100644
--- a/hl/tools/gif2h5/Makefile.in
+++ b/hl/tools/gif2h5/Makefile.in
@@ -645,10 +645,20 @@ install-doc uninstall-doc:
 check-TESTS: test
 
 test _test:
-	$(MAKE) check-s
-	$(MAKE) check-p
+	$(MAKE) _check-s
+	$(MAKE) _check-p
 
-check-s: $(LIB) $(PROGS) $(TESTS)
+# Run check-s/check-p recursively down SUBDIRS
+check-s check-p:
+	@$(MAKE) $(AM_MAKEFLAGS) _$@ || exit 1;                          \
+	for d in X $(SUBDIRS); do                                             \
+	    if test $$d != X -a $$d != .; then                                \
+	        (set -x; cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;     \
+	    fi;                                                               \
+	done
+
+# Actual execution of check-s.
+_check-s: $(LIB) $(PROGS) $(TESTS)
 	@if test -n "$(TEST_PROG)$(TEST_SCRIPT)"; then      \
 	   echo "===Serial tests in `echo ${PWD} | sed -e s:.*/::` begin `date`==="; \
         fi
@@ -695,7 +705,8 @@ check-s: $(LIB) $(PROGS) $(TESTS)
 	    echo "===Serial tests in `echo ${PWD} | sed -e s:.*/::` ended `date`===";\
 	fi
 
-check-p: $(LIB) $(PROGS) $(TESTS)
+# Actual execution of check-p.
+_check-p: $(LIB) $(PROGS) $(TESTS)
 	@if test -n "$(TEST_PROG_PARA)$(TEST_SCRIPT_PARA)"; then      \
 	   echo "===Parallel tests in `echo ${PWD} | sed -e s:.*/::` begin `date`==="; \
         fi