diff options
author | Larry Knox <lrknox@hdfgroup.org> | 2019-06-12 15:21:41 (GMT) |
---|---|---|
committer | Larry Knox <lrknox@hdfgroup.org> | 2019-06-12 15:21:41 (GMT) |
commit | 5385f032dd5aaf9a09c2a86374c0d3a826e41010 (patch) | |
tree | 307786b2639ee1a7500b4f695213bd6201deae74 /src/Makefile.am | |
parent | 54a07f556cd2f3556f8c7946fe7905bc658a11aa (diff) | |
download | hdf5-5385f032dd5aaf9a09c2a86374c0d3a826e41010.zip hdf5-5385f032dd5aaf9a09c2a86374c0d3a826e41010.tar.gz hdf5-5385f032dd5aaf9a09c2a86374c0d3a826e41010.tar.bz2 |
Modified Makefile.ams for h5repack, h5watch and gif2h5 to allow
disabling tests.
Moved h5cc.in from tools/src/misc to src directory to always create h5cc
whether or not tools are enabled.
Added configuration status of tools and tests to libhdf5.settings.
Diffstat (limited to 'src/Makefile.am')
-rw-r--r-- | src/Makefile.am | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 378e390..f74d18f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -32,10 +32,18 @@ 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 +DISTCLEANFILES=H5pubconf.h $(H5CC_NAME) # library sources libhdf5_la_SOURCES= H5.c H5checksum.c H5dbg.c H5system.c H5timer.c H5trace.c \ @@ -150,6 +158,8 @@ 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. @@ -208,4 +218,10 @@ 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 + |