diff options
| author | Jacob Smith <jake.smith@hdfgroup.org> | 2019-06-20 17:37:27 (GMT) |
|---|---|---|
| committer | Jacob Smith <jake.smith@hdfgroup.org> | 2019-06-20 17:37:27 (GMT) |
| commit | 27d5742b3956622dd41d2edf89d20314224c5f38 (patch) | |
| tree | 4efb591d864060b66a6b0f410cff57a338bb8805 /Makefile.am | |
| parent | 63fc460c137e871d21941de8fedc4371be229d42 (diff) | |
| parent | 2e973f7e12301975f9d8dfdd5534682525554e77 (diff) | |
| download | hdf5-27d5742b3956622dd41d2edf89d20314224c5f38.zip hdf5-27d5742b3956622dd41d2edf89d20314224c5f38.tar.gz hdf5-27d5742b3956622dd41d2edf89d20314224c5f38.tar.bz2 | |
Merge branch 'develop' into bugfix/repack_external_storage
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/Makefile.am b/Makefile.am index 7f872b0..d96ffe3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -49,11 +49,6 @@ include $(top_srcdir)/config/commence.am # Conditionals. These conditionals are defined during configure # Define each variable to empty if it is not used to placate pmake -if BUILD_PARALLEL_CONDITIONAL - TESTPARALLEL_DIR =testpar -else - TESTPARALLEL_DIR= -endif if BUILD_CXX_CONDITIONAL CXX_DIR =c++ else @@ -74,9 +69,24 @@ if BUILD_HDF5_HL_CONDITIONAL else HDF5_HL_DIR= endif +if BUILD_TESTS_CONDITIONAL + TESTSERIAL_DIR =test +else + TESTSERIAL_DIR= +endif +if BUILD_TESTS_PARALLEL_CONDITIONAL + TESTPARALLEL_DIR =testpar +else + TESTPARALLEL_DIR= +endif +if BUILD_TOOLS_CONDITIONAL + TOOLS_DIR =tools +else + TOOLS_DIR= +endif -SUBDIRS = src test $(TESTPARALLEL_DIR) tools . $(CXX_DIR) $(FORTRAN_DIR) \ - $(JAVA_DIR) $(HDF5_HL_DIR) +SUBDIRS = src $(TESTSERIAL_DIR) $(TESTPARALLEL_DIR) bin $(TOOLS_DIR) . \ + $(CXX_DIR) $(FORTRAN_DIR) $(JAVA_DIR) $(HDF5_HL_DIR) DIST_SUBDIRS = src test testpar tools . c++ fortran hl examples java # Some files generated during configure that should be cleaned |