diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2017-04-18 16:04:22 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2017-04-18 21:56:17 (GMT) |
| commit | 16346d97fa8254e22ab495c832afda9de5313b9c (patch) | |
| tree | d2c136729da06d60109d6d1079d34d3330c5791a | |
| parent | e710ee4ea282fd278d77f7a76004b48dcdc8edb4 (diff) | |
| download | hdf5-16346d97fa8254e22ab495c832afda9de5313b9c.zip hdf5-16346d97fa8254e22ab495c832afda9de5313b9c.tar.gz hdf5-16346d97fa8254e22ab495c832afda9de5313b9c.tar.bz2 | |
HDFFV-10170 undo patch
| -rw-r--r-- | test/Makefile.am | 13 | ||||
| -rw-r--r-- | tools/test/h5dump/Makefile.am | 1 | ||||
| -rw-r--r-- | tools/test/h5repack/Makefile.am | 2 |
3 files changed, 9 insertions, 7 deletions
diff --git a/test/Makefile.am b/test/Makefile.am index 0d85117..2dfbb37 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -98,21 +98,20 @@ if BUILD_ALL_CONDITIONAL noinst_PROGRAMS=$(BUILD_ALL_PROGS) endif -if HAVE_SHARED_CONDITIONAL - # The libh5test library provides common support code for the tests. - noinst_LTLIBRARIES=libh5test.la +# The libh5test library provides common support code for the tests. +noinst_LTLIBRARIES=libh5test.la +if HAVE_SHARED_CONDITIONAL # The libdynlib1, libdynlib2, libdynlib3, and libdynlib4 library for testing plugin module plugin.c. # Build it as shared library if configure is enabled for shared library. - noinst_LTLIBRARIES+=libdynlib1.la libdynlib2.la libdynlib3.la libdynlib4.la + lib_LTLIBRARIES=libdynlib1.la libdynlib2.la libdynlib3.la libdynlib4.la libdynlib1_la_SOURCES=dynlib1.c libdynlib2_la_SOURCES=dynlib2.c libdynlib3_la_SOURCES=dynlib3.c libdynlib4_la_SOURCES=dynlib4.c -else - # The libh5test library provides common support code for the tests. - noinst_LTLIBRARIES=libh5test.la +install-exec-hook: + $(RM) $(DESTDIR)$(libdir)/*dynlib* endif libh5test_la_SOURCES=h5test.c testframe.c cache_common.c swmr_common.c diff --git a/tools/test/h5dump/Makefile.am b/tools/test/h5dump/Makefile.am index 9a63730..3637af2 100644 --- a/tools/test/h5dump/Makefile.am +++ b/tools/test/h5dump/Makefile.am @@ -41,6 +41,7 @@ if HAVE_SHARED_CONDITIONAL # Build it as shared library if configure is enabled for shared library. lib_LTLIBRARIES=libdynlibdump.la libdynlibdump_la_SOURCES=dynlib_dump.c + libdynlibdump_la_LDFLAGS = -avoid-version -module -shared -export-dynamic install-exec-hook: $(RM) $(DESTDIR)$(libdir)/*dynlib* diff --git a/tools/test/h5repack/Makefile.am b/tools/test/h5repack/Makefile.am index 8af8091..8284839 100644 --- a/tools/test/h5repack/Makefile.am +++ b/tools/test/h5repack/Makefile.am @@ -48,6 +48,8 @@ if HAVE_SHARED_CONDITIONAL lib_LTLIBRARIES=libdynlibadd.la libdynlibvers.la libdynlibadd_la_SOURCES=dynlib_rpk.c libdynlibvers_la_SOURCES=dynlib_vrpk.c + libdynlibadd_la_LDFLAGS = -avoid-version -module -shared -export-dynamic + libdynlibvers_la_LDFLAGS = -avoid-version -module -shared -export-dynamic install-exec-hook: $(RM) $(DESTDIR)$(libdir)/*dynlib* |