diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2017-04-18 20:22:12 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2017-04-18 20:22:12 (GMT) |
| commit | 8f34c3cfd46054f6478b34df6af324c353e44d62 (patch) | |
| tree | 6fa2ade5a0765e261a0265a07709bed88d128b23 /test | |
| parent | b17ffc3cef223dc662cc330edee546841929818c (diff) | |
| parent | 62770c64326f844739c2753bfee49c297f2c7a39 (diff) | |
| download | hdf5-8f34c3cfd46054f6478b34df6af324c353e44d62.zip hdf5-8f34c3cfd46054f6478b34df6af324c353e44d62.tar.gz hdf5-8f34c3cfd46054f6478b34df6af324c353e44d62.tar.bz2 | |
Merge pull request #436 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '62770c64326f844739c2753bfee49c297f2c7a39':
Update tool dyn lib
LDFLAGS module forces .so lib to be built on osx instead of .dylib
java jni lib also needs to avoid the version-info
HDFFV-10170 undo patch
Add plugin options for libs
Diffstat (limited to 'test')
| -rw-r--r-- | test/Makefile.am | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/test/Makefile.am b/test/Makefile.am index 49b251a..79dc17f 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -100,21 +100,24 @@ 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 + libdynlib1_la_LDFLAGS = -avoid-version -module -shared -export-dynamic + libdynlib2_la_LDFLAGS = -avoid-version -module -shared -export-dynamic + libdynlib3_la_LDFLAGS = -avoid-version -module -shared -export-dynamic + libdynlib4_la_LDFLAGS = -avoid-version -module -shared -export-dynamic -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 |