diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2019-06-14 21:18:06 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2019-06-14 21:18:06 (GMT) |
| commit | 9ef56483f6447b60cf7568e2022aa5d8f193427c (patch) | |
| tree | fe720aa41e3858dbc20de1190f23188227108b2e /src/Makefile.am | |
| parent | a2890b5d09383d855d1de4e889b032250f300fcf (diff) | |
| parent | d5a262c424d0d1bc4d96a0015487b51202df91a7 (diff) | |
| download | hdf5-9ef56483f6447b60cf7568e2022aa5d8f193427c.zip hdf5-9ef56483f6447b60cf7568e2022aa5d8f193427c.tar.gz hdf5-9ef56483f6447b60cf7568e2022aa5d8f193427c.tar.bz2 | |
Merge branch 'develop' into vol_dev_headers
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 73a8c83..0eaae1a 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 \ @@ -160,8 +152,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. @@ -220,10 +210,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 |