diff options
author | Allen Byrne <50328838+byrnHDF@users.noreply.github.com> | 2021-09-17 16:01:50 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-09-17 16:01:50 (GMT) |
commit | 9e93204a23346a5b7cf5b8673cf50e6ac2497021 (patch) | |
tree | e4a289bd0235bd6fdbdb6fa4b2c932315315a84b /hl/Makefile.am | |
parent | d44f3106495830609858d424d11d85276a5237f2 (diff) | |
download | hdf5-9e93204a23346a5b7cf5b8673cf50e6ac2497021.zip hdf5-9e93204a23346a5b7cf5b8673cf50e6ac2497021.tar.gz hdf5-9e93204a23346a5b7cf5b8673cf50e6ac2497021.tar.bz2 |
1.8 Merge HDFFV-11266 - add option to build HL tools #1018 (#1022)
* Merge HDFFV-11266 - add option to build HL tools #1018
* Update configure and Makefile.ins with bin/reconfigure.
Co-authored-by: Larry Knox <lrknox@hdfgroup.org>
Diffstat (limited to 'hl/Makefile.am')
-rw-r--r-- | hl/Makefile.am | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/hl/Makefile.am b/hl/Makefile.am index 4e57228..8c427d3 100644 --- a/hl/Makefile.am +++ b/hl/Makefile.am @@ -10,7 +10,7 @@ # If you do not have access to either file, you may request a copy from # help@hdfgroup.org. # -# +# # This makefile mostly just reinvokes make in the various subdirectories # but does so in the correct order. You can alternatively invoke make from # each subdirectory manually. @@ -31,17 +31,20 @@ endif if BUILD_CXX_CONDITIONAL CXX_DIR = c++ endif - if BUILD_TESTS_CONDITIONAL TEST_DIR = test else TEST_DIR = endif if BUILD_TOOLS_CONDITIONAL +if BUILD_TOOLS_HL_CONDITIONAL TOOLS_DIR = tools else TOOLS_DIR = endif +else + TOOLS_DIR = +endif ## Don't recurse into any subdirectories if HDF5 is not configured to ## use the HL library |