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 /hl/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 'hl/Makefile.am')
-rw-r--r-- | hl/Makefile.am | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/hl/Makefile.am b/hl/Makefile.am index 172d0e8..ded7aa0 100644 --- a/hl/Makefile.am +++ b/hl/Makefile.am @@ -31,11 +31,21 @@ endif if BUILD_CXX_CONDITIONAL CXX_DIR = c++ endif +if BUILD_TESTS_CONDITIONAL + TEST_DIR = test +else + TEST_DIR = +endif +if BUILD_TOOLS_CONDITIONAL + TOOLS_DIR = tools +else + TOOLS_DIR = +endif ## Don't recurse into any subdirectories if HDF5 is not configured to ## use the HL library if BUILD_HDF5_HL_CONDITIONAL - SUBDIRS=src test tools $(CXX_DIR) $(FORTRAN_DIR) + SUBDIRS=src $(TEST_DIR) $(TOOLS_DIR) $(CXX_DIR) $(FORTRAN_DIR) # Test with just the native connector, with a single pass-through connector # and with a doubly-stacked pass-through. |