diff options
author | lrknox <lrknox> | 2017-06-12 22:04:41 (GMT) |
---|---|---|
committer | lrknox <lrknox> | 2017-06-12 22:04:41 (GMT) |
commit | 16e0eb3c5238d358e0db3d6b3d83ac14b5550e92 (patch) | |
tree | b530678f2a6ce550a06ae4a69e187af22aa599f4 /test/Makefile.am | |
parent | 62142b4cbc374e832accf687b25c8146eaab3952 (diff) | |
download | hdf5-16e0eb3c5238d358e0db3d6b3d83ac14b5550e92.zip hdf5-16e0eb3c5238d358e0db3d6b3d83ac14b5550e92.tar.gz hdf5-16e0eb3c5238d358e0db3d6b3d83ac14b5550e92.tar.bz2 |
Moved libdynlib* plugin test libraries to noist_LT_LIBRARIES with added
flag '-rpath /nowhere' to stop them being installed while keeping them
from linking with libhdf5, etc.
Incremented version to 1.8.19-pre1 and ran bin/release to create tar
and zip files for testing.
Diffstat (limited to 'test/Makefile.am')
-rw-r--r-- | test/Makefile.am | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/test/Makefile.am b/test/Makefile.am index 30721bd..4ce7a87 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -73,21 +73,18 @@ if BUILD_ALL_CONDITIONAL noinst_PROGRAMS=$(BUILD_ALL_PROGS) endif -# 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. - dyn_LTLIBRARIES=libdynlib1.la libdynlib2.la libdynlib3.la libdynlib4.la + noinst_LTLIBRARIES=libh5test.la 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 + libdynlib1_la_LDFLAGS = -avoid-version -module -shared -export-dynamic -rpath /nowhere + libdynlib2_la_LDFLAGS = -avoid-version -module -shared -export-dynamic -rpath /nowhere + libdynlib3_la_LDFLAGS = -avoid-version -module -shared -export-dynamic -rpath /nowhere + libdynlib4_la_LDFLAGS = -avoid-version -module -shared -export-dynamic -rpath /nowhere libdynlib1.la: $(libdynlib1_la_OBJECTS) $(libdynlib1_la_DEPENDENCIES) $(EXTRA_libdynlib1_la_DEPENDENCIES) $(AM_V_CCLD)$(libdynlib1_la_LINK) $(am_libdynlib1_la_rpath) $(libdynlib1_la_OBJECTS) $(libdynlib1_la_LIBADD) @@ -100,9 +97,9 @@ libdynlib3.la: $(libdynlib3_la_OBJECTS) $(libdynlib3_la_DEPENDENCIES) $(EXTRA_li libdynlib4.la: $(libdynlib4_la_OBJECTS) $(libdynlib4_la_DEPENDENCIES) $(EXTRA_libdynlib4_la_DEPENDENCIES) $(AM_V_CCLD)$(libdynlib4_la_LINK) $(am_libdynlib4_la_rpath) $(libdynlib4_la_OBJECTS) $(libdynlib4_la_LIBADD) - -#install-exec-hook: -# $(RM) $(DESTDIR)$(libdir)/*dynlib* +else + # The libh5test library provides common support code for the tests. + noinst_LTLIBRARIES=libh5test.la endif libh5test_la_SOURCES=h5test.c testframe.c cache_common.c |