diff options
| author | Larry Knox <lrknox@hdfgroup.org> | 2019-06-14 20:20:45 (GMT) |
|---|---|---|
| committer | Larry Knox <lrknox@hdfgroup.org> | 2019-06-14 20:20:45 (GMT) |
| commit | d5a262c424d0d1bc4d96a0015487b51202df91a7 (patch) | |
| tree | 842c42e374ba90e0e3efed3f60da36329576f194 /Makefile.am | |
| parent | 7b97bcf97228de9a381cad243d51d990b200826d (diff) | |
| parent | 04dc4ef436b087cfc45030b9183386598d1b4bae (diff) | |
| download | hdf5-d5a262c424d0d1bc4d96a0015487b51202df91a7.zip hdf5-d5a262c424d0d1bc4d96a0015487b51202df91a7.tar.gz hdf5-d5a262c424d0d1bc4d96a0015487b51202df91a7.tar.bz2 | |
Merge pull request #1736 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to develop
* commit '04dc4ef436b087cfc45030b9183386598d1b4bae':
Moved h5cc.in and h5redeploy.in from tools/misc to bin directory. They should always be built and installed whether tools are enabled or disabled. Also added Makefile.am to bin to build h5redeploy and to install and uninstall them. h5cc is created from h5cc.in by configure.
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index a3c4385..d96ffe3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -85,8 +85,8 @@ else TOOLS_DIR= endif -SUBDIRS = src $(TESTSERIAL_DIR) $(TESTPARALLEL_DIR) $(TOOLS_DIR) . $(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 |