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

35 files changed, 525 insertions, 140 deletions

diff --git a/c++/Makefile.in b/c++/Makefile.in
index 2a3ba8f..8c10bf9 100644
--- a/c++/Makefile.in
+++ b/c++/Makefile.in
@@ -663,10 +663,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
@@ -713,7 +723,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/c++/examples/Makefile.in b/c++/examples/Makefile.in
index 35009ad..b2ebeba 100644
--- a/c++/examples/Makefile.in
+++ b/c++/examples/Makefile.in
@@ -556,10 +556,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
@@ -606,7 +616,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/c++/src/Makefile.in b/c++/src/Makefile.in
index ebe10e2..0bcf7c7 100644
--- a/c++/src/Makefile.in
+++ b/c++/src/Makefile.in
@@ -741,10 +741,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
@@ -791,7 +801,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/c++/test/Makefile.in b/c++/test/Makefile.in
index e8a644e..61b2e33 100644
--- a/c++/test/Makefile.in
+++ b/c++/test/Makefile.in
@@ -629,10 +629,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
@@ -679,7 +689,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/config/conclude.am b/config/conclude.am
index 082985d..89d19f3 100644
--- a/config/conclude.am
+++ b/config/conclude.am
@@ -49,10 +49,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
@@ -99,7 +109,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/examples/Makefile.in b/examples/Makefile.in
index 1fc321b..0b06d9a 100644
--- a/examples/Makefile.in
+++ b/examples/Makefile.in
@@ -569,10 +569,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
@@ -619,7 +629,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/fortran/Makefile.in b/fortran/Makefile.in
index 63ec756..2af5569 100644
--- a/fortran/Makefile.in
+++ b/fortran/Makefile.in
@@ -672,10 +672,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
@@ -722,7 +732,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/fortran/examples/Makefile.in b/fortran/examples/Makefile.in
index 4488132..804f97d 100644
--- a/fortran/examples/Makefile.in
+++ b/fortran/examples/Makefile.in
@@ -572,10 +572,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
@@ -622,7 +632,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/fortran/src/Makefile.in b/fortran/src/Makefile.in
index a953330..330d3d3 100644
--- a/fortran/src/Makefile.in
+++ b/fortran/src/Makefile.in
@@ -851,10 +851,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
@@ -901,7 +911,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/fortran/test/Makefile.in b/fortran/test/Makefile.in
index 738b36d..2fa6e3f 100644
--- a/fortran/test/Makefile.in
+++ b/fortran/test/Makefile.in
@@ -836,10 +836,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
@@ -886,7 +896,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/fortran/testpar/Makefile.in b/fortran/testpar/Makefile.in
index b465cf1..af17001 100644
--- a/fortran/testpar/Makefile.in
+++ b/fortran/testpar/Makefile.in
@@ -602,10 +602,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
@@ -652,7 +662,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/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
diff --git a/perform/Makefile.in b/perform/Makefile.in
index 82ac287..dcb83e5 100644
--- a/perform/Makefile.in
+++ b/perform/Makefile.in
@@ -704,10 +704,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
@@ -754,7 +764,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/src/Makefile.in b/src/Makefile.in
index 829d30d..6b35caf 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -953,10 +953,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
@@ -1003,7 +1013,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/test/Makefile.in b/test/Makefile.in
index 71a5da9..128bf98 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -1061,10 +1061,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
@@ -1111,7 +1121,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/testpar/Makefile.in b/testpar/Makefile.in
index 49dd7ea..c695f16 100644
--- a/testpar/Makefile.in
+++ b/testpar/Makefile.in
@@ -643,10 +643,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
@@ -693,7 +703,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/tools/Makefile.in b/tools/Makefile.in
index cde0c4e..8a9008b 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -642,10 +642,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
@@ -692,7 +702,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/tools/gifconv/Makefile.in b/tools/gifconv/Makefile.in
index 3a1abea..9574696 100644
--- a/tools/gifconv/Makefile.in
+++ b/tools/gifconv/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
diff --git a/tools/h5diff/Makefile.in b/tools/h5diff/Makefile.in
index b7c6df4..a5bf0b5 100644
--- a/tools/h5diff/Makefile.in
+++ b/tools/h5diff/Makefile.in
@@ -685,10 +685,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
@@ -735,7 +745,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/tools/h5dump/Makefile.in b/tools/h5dump/Makefile.in
index 17e6f00..724a418 100644
--- a/tools/h5dump/Makefile.in
+++ b/tools/h5dump/Makefile.in
@@ -661,10 +661,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
@@ -711,7 +721,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/tools/h5import/Makefile.in b/tools/h5import/Makefile.in
index 73d6b89..d7a2329 100755
--- a/tools/h5import/Makefile.in
+++ b/tools/h5import/Makefile.in
@@ -652,10 +652,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
@@ -702,7 +712,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/tools/h5jam/Makefile.in b/tools/h5jam/Makefile.in
index 1163866..866b3b5 100644
--- a/tools/h5jam/Makefile.in
+++ b/tools/h5jam/Makefile.in
@@ -678,10 +678,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
@@ -728,7 +738,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/tools/h5ls/Makefile.in b/tools/h5ls/Makefile.in
index 3cbbf2b..7a4bb64 100644
--- a/tools/h5ls/Makefile.in
+++ b/tools/h5ls/Makefile.in
@@ -632,10 +632,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
@@ -682,7 +692,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/tools/h5repack/Makefile.in b/tools/h5repack/Makefile.in
index 101ae11..660e253 100644
--- a/tools/h5repack/Makefile.in
+++ b/tools/h5repack/Makefile.in
@@ -711,10 +711,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
@@ -761,7 +771,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/tools/lib/Makefile.in b/tools/lib/Makefile.in
index 7ca9e0d..1a7369e 100644
--- a/tools/lib/Makefile.in
+++ b/tools/lib/Makefile.in
@@ -649,10 +649,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
@@ -699,7 +709,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/tools/misc/Makefile.in b/tools/misc/Makefile.in
index 7caf956..60c4454 100644
--- a/tools/misc/Makefile.in
+++ b/tools/misc/Makefile.in
@@ -743,10 +743,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
@@ -793,7 +803,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