diff options
| author | lrknox <lrknox> | 2017-05-10 18:54:18 (GMT) |
|---|---|---|
| committer | lrknox <lrknox> | 2017-05-10 18:54:18 (GMT) |
| commit | 0ff30fa67ca92fe59d99b4bbc6addbc01f219043 (patch) | |
| tree | 84fdfb11c5b74c92737d4b0e4224d609140e34e4 /tools/h5ls/Makefile.am | |
| parent | faef710a862566208fb34bff1d10dd50a02233f2 (diff) | |
| download | hdf5-0ff30fa67ca92fe59d99b4bbc6addbc01f219043.zip hdf5-0ff30fa67ca92fe59d99b4bbc6addbc01f219043.tar.gz hdf5-0ff30fa67ca92fe59d99b4bbc6addbc01f219043.tar.bz2 | |
Move libdynlib* test lib files from lib_LTLIBRARIES to dyn_LTLIBRARIES
and other changes to Makefiles and config/conclude.am to eliminate
link errors with new libdynlib*_la_LDFLAGS which were added to stop
libdynlib* files linking to external libraries.
Diffstat (limited to 'tools/h5ls/Makefile.am')
| -rw-r--r-- | tools/h5ls/Makefile.am | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/tools/h5ls/Makefile.am b/tools/h5ls/Makefile.am index bee5d79..f78e777 100644 --- a/tools/h5ls/Makefile.am +++ b/tools/h5ls/Makefile.am @@ -44,11 +44,15 @@ LDADD=$(LIBH5TOOLS) $(LIBHDF5) if HAVE_SHARED_CONDITIONAL # Build it as shared library if configure is enabled for shared library. - lib_LTLIBRARIES=libdynlibls.la + dyn_LTLIBRARIES=libdynlibls.la libdynlibls_la_SOURCES=dynlib_ls.c + libdynlibls_la_LDFLAGS = -avoid-version -module -shared -export-dynamic -install-exec-hook: - $(RM) $(DESTDIR)$(libdir)/*dynlib* +libdynlibls.la: $(libdynlibls_la_OBJECTS) $(libdynlibls_la_DEPENDENCIES) $(EXTRA_libdynlibls_la_DEPENDENCIES) + $(AM_V_CCLD)$(libdynlibls_la_LINK) $(am_libdynlibls_la_rpath) $(libdynlibls_la_OBJECTS) $(libdynlibls_la_LIBADD) + +#install-exec-hook: +# $(RM) $(DESTDIR)$(libdir)/*dynlib* endif DISTCLEANFILES=h5ls_plugin.sh |