diff options
| author | Larry Knox <lrknox@hdfgroup.org> | 2020-03-20 19:37:46 (GMT) |
|---|---|---|
| committer | Larry Knox <lrknox@hdfgroup.org> | 2020-03-20 19:37:46 (GMT) |
| commit | 0de545ac8b2a85a0edca389ae8db8d2bdfccbeb8 (patch) | |
| tree | 0401368d58ad5b578420c3c2d5de38c2caf39fbf /tools | |
| parent | d8ad45be791d2c3e7a4fc3494f2b4d95cd7cf3b7 (diff) | |
| download | hdf5-0de545ac8b2a85a0edca389ae8db8d2bdfccbeb8.zip hdf5-0de545ac8b2a85a0edca389ae8db8d2bdfccbeb8.tar.gz hdf5-0de545ac8b2a85a0edca389ae8db8d2bdfccbeb8.tar.bz2 | |
Correct conditions for parallel builds with and without tests.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/h5diff/Makefile.am | 2 | ||||
| -rw-r--r-- | tools/h5diff/Makefile.in | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tools/h5diff/Makefile.am b/tools/h5diff/Makefile.am index 13044e5..d9e514b 100644 --- a/tools/h5diff/Makefile.am +++ b/tools/h5diff/Makefile.am @@ -25,7 +25,7 @@ AM_CPPFLAGS+=-I$(top_srcdir)/src -I$(top_srcdir)/tools/lib # is enabled. if BUILD_PARALLEL_CONDITIONAL H5PDIFF=ph5diff -if BUILD_TESTS_CONDITIONAL +if BUILD_TESTS_PARALLEL_CONDITIONAL TEST_SCRIPT_PARA=testph5diff.sh else TEST_SCRIPT_PARA= diff --git a/tools/h5diff/Makefile.in b/tools/h5diff/Makefile.in index 5c7cffa..8886dc5 100644 --- a/tools/h5diff/Makefile.in +++ b/tools/h5diff/Makefile.in @@ -708,8 +708,8 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 *.h5 expect_sorted \ # Always build and test h5diff but build and test ph5diff only if parallel # is enabled. @BUILD_PARALLEL_CONDITIONAL_TRUE@H5PDIFF = ph5diff -@BUILD_PARALLEL_CONDITIONAL_TRUE@@BUILD_TESTS_CONDITIONAL_FALSE@TEST_SCRIPT_PARA = -@BUILD_PARALLEL_CONDITIONAL_TRUE@@BUILD_TESTS_CONDITIONAL_TRUE@TEST_SCRIPT_PARA = testph5diff.sh +@BUILD_PARALLEL_CONDITIONAL_TRUE@@BUILD_TESTS_PARALLEL_CONDITIONAL_FALSE@TEST_SCRIPT_PARA = +@BUILD_PARALLEL_CONDITIONAL_TRUE@@BUILD_TESTS_PARALLEL_CONDITIONAL_TRUE@TEST_SCRIPT_PARA = testph5diff.sh # Add h5diff specific linker flags here h5diff_LDFLAGS = $(LT_STATIC_EXEC) $(AM_LDFLAGS) |