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 /src/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 'src/Makefile.am')
-rw-r--r-- | src/Makefile.am | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index f74d18f..0fa7879 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -32,18 +32,10 @@ lib_LTLIBRARIES=libhdf5.la # Add libtool numbers to the HDF5 library (from config/lt_vers.am) libhdf5_la_LDFLAGS= -version-info $(LT_VERS_INTERFACE):$(LT_VERS_REVISION):$(LT_VERS_AGE) $(AM_LDFLAGS) -# h5cc needs custom install and uninstall rules, since it may be -# named h5pcc if hdf5 is being built in parallel mode. -if BUILD_PARALLEL_CONDITIONAL - H5CC_NAME=h5pcc -else - H5CC_NAME=h5cc -endif - # H5Tinit.c and H5lib_settings.c are generated files and should be cleaned. MOSTLYCLEANFILES=H5Tinit.c H5lib_settings.c # H5pubconf.h is generated by configure, and should be cleaned. -DISTCLEANFILES=H5pubconf.h $(H5CC_NAME) +DISTCLEANFILES=H5pubconf.h # library sources libhdf5_la_SOURCES= H5.c H5checksum.c H5dbg.c H5system.c H5timer.c H5trace.c \ @@ -158,8 +150,6 @@ include_HEADERS = hdf5.h H5api_adpt.h H5overflow.h H5pubconf.h H5public.h H5vers settingsdir=$(libdir) settings_DATA=libhdf5.settings -bin_SCRIPTS=$(H5CC_NAME) - # Number format detection # The LD_LIBRARY_PATH setting is a kludge. # Things should have been all set during H5detect making. @@ -218,10 +208,5 @@ trace: $(libhdf5_la_SOURCES) fi; \ done -#install-exec-local: -# @$(INSTALL) h5cc $(DESTDIR)$(bindir)/$(H5CC_NAME) -#uninstall-local: -# @$(RM) $(DESTDIR)$(bindir)/$(H5CC_NAME) - include $(top_srcdir)/config/conclude.am |