summaryrefslogtreecommitdiffstats
path: root/fortran
diff options
context:
space:
mode:
authorDhvanil Popat <dpopat@hdfgroup.org>2019-06-25 01:40:07 (GMT)
committerDhvanil Popat <dpopat@hdfgroup.org>2019-06-25 01:40:07 (GMT)
commit5d954a0214fa92aec884cdbccab10632a925fc08 (patch)
treee0f7ec80bb373be7685f4b38c1e7ccdd5902c1b1 /fortran
parent39537399a10dc27ac22a804e55d77d7160d1bd76 (diff)
downloadhdf5-5d954a0214fa92aec884cdbccab10632a925fc08.zip
hdf5-5d954a0214fa92aec884cdbccab10632a925fc08.tar.gz
hdf5-5d954a0214fa92aec884cdbccab10632a925fc08.tar.bz2
Squash commit of options to build tools and tests
Diffstat (limited to 'fortran')
-rw-r--r--fortran/Makefile.am11
1 files changed, 9 insertions, 2 deletions
diff --git a/fortran/Makefile.am b/fortran/Makefile.am
index 38084b9..99880dd 100644
--- a/fortran/Makefile.am
+++ b/fortran/Makefile.am
@@ -22,14 +22,21 @@
include $(top_srcdir)/config/commence.am
-if BUILD_PARALLEL_CONDITIONAL
+if BUILD_TESTS_PARALLEL_CONDITIONAL
TESTPARALLEL_DIR=testpar
+else
+ TESTPARALLEL_DIR=
+endif
+if BUILD_TESTS_CONDITIONAL
+ TESTSERIAL_DIR=test
+else
+ TESTSERIAL_DIR=
endif
# Subdirectories in build order, not including examples directory
## Only recurse into subdirectories if HDF5 is configured to use Fortran.
if BUILD_FORTRAN_CONDITIONAL
- SUBDIRS=src test $(TESTPARALLEL_DIR)
+ SUBDIRS=src $(TESTSERIAL_DIR) $(TESTPARALLEL_DIR)
endif
# All directories that have Makefiles