summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Laird <jlaird@hdfgroup.org>2005-12-13 21:55:57 (GMT)
committerJames Laird <jlaird@hdfgroup.org>2005-12-13 21:55:57 (GMT)
commit7a4780e0def60568adb29e8cdcc6c25f253dd787 (patch)
tree7ea89e2756a45dddeb678217b6362a1bf94ecb46
parentfde99876a3b57f06f37d14727508975712667b5d (diff)
downloadhdf5-7a4780e0def60568adb29e8cdcc6c25f253dd787.zip
hdf5-7a4780e0def60568adb29e8cdcc6c25f253dd787.tar.gz
hdf5-7a4780e0def60568adb29e8cdcc6c25f253dd787.tar.bz2
[svn-r11792] Purpose:
Makefile fix Description: The h5diff parallel test script depends on the serial test script. Added this dependency. Solution: Used SCRIPT_DEPEND variable. Also added ph5diff (when it is compiled). Platforms tested: mir
-rw-r--r--tools/h5diff/Makefile.am3
-rw-r--r--tools/h5diff/Makefile.in3
2 files changed, 4 insertions, 2 deletions
diff --git a/tools/h5diff/Makefile.am b/tools/h5diff/Makefile.am
index fc2a08d..2d5ed69 100644
--- a/tools/h5diff/Makefile.am
+++ b/tools/h5diff/Makefile.am
@@ -38,7 +38,8 @@ TEST_SCRIPT=$(srcdir)/testh5diff.sh
check_PROGRAMS=$(TEST_PROG)
check_SCRIPTS=$(TEST_SCRIPT) $(TEST_SCRIPT_PARA)
-SCRIPT_DEPEND=h5diff$(EXEEXT)
+# The parallel test script testph5diff.sh actually depends on testh5diff.sh.
+SCRIPT_DEPEND=h5diff$(EXEEXT) $(H5PDIFF) $(srcdir)/testh5diff.sh
# Source files for the program
h5diff_SOURCES=h5diff_main.c h5diff_common.c
diff --git a/tools/h5diff/Makefile.in b/tools/h5diff/Makefile.in
index 168fbaf..c121b09 100644
--- a/tools/h5diff/Makefile.in
+++ b/tools/h5diff/Makefile.in
@@ -359,7 +359,8 @@ INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/tools/lib
TEST_PROG = h5difftst
TEST_SCRIPT = $(srcdir)/testh5diff.sh
check_SCRIPTS = $(TEST_SCRIPT) $(TEST_SCRIPT_PARA)
-SCRIPT_DEPEND = h5diff$(EXEEXT)
+# The parallel test script testph5diff.sh actually depends on testh5diff.sh.
+SCRIPT_DEPEND = h5diff$(EXEEXT) $(H5PDIFF) $(srcdir)/testh5diff.sh
# Source files for the program
h5diff_SOURCES = h5diff_main.c h5diff_common.c