diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2019-06-14 19:23:06 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2019-06-14 19:23:06 (GMT) |
| commit | bb9370d777b645b9f0e2f5090421b63e207aa50f (patch) | |
| tree | 932aa5b7867b332c854faed4e308abf4e265a5cf /hl/Makefile.am | |
| parent | d5a8b2a80cd1e5aaa62a523e03a5936260a56f60 (diff) | |
| parent | 57d5c207d94bf876c934094cc7193858590a2c9f (diff) | |
| download | hdf5-bb9370d777b645b9f0e2f5090421b63e207aa50f.zip hdf5-bb9370d777b645b9f0e2f5090421b63e207aa50f.tar.gz hdf5-bb9370d777b645b9f0e2f5090421b63e207aa50f.tar.bz2 | |
Merge branch 'develop' into vol_dev_headers
Also moved the wrapper functions from the H5VLconnector.h to
H5VLconnector_passthru.h
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. |