summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2017-04-18 20:22:12 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2017-04-18 20:22:12 (GMT)
commit8f34c3cfd46054f6478b34df6af324c353e44d62 (patch)
tree6fa2ade5a0765e261a0265a07709bed88d128b23
parentb17ffc3cef223dc662cc330edee546841929818c (diff)
parent62770c64326f844739c2753bfee49c297f2c7a39 (diff)
downloadhdf5-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
-rw-r--r--java/src/jni/Makefile.am2
-rw-r--r--test/Makefile.am17
-rw-r--r--tools/test/h5diff/Makefile.am1
-rw-r--r--tools/test/h5dump/Makefile.am1
-rw-r--r--tools/test/h5repack/Makefile.am6
5 files changed, 18 insertions, 9 deletions
diff --git a/java/src/jni/Makefile.am b/java/src/jni/Makefile.am
index 4667407..fdf6608 100644
--- a/java/src/jni/Makefile.am
+++ b/java/src/jni/Makefile.am
@@ -31,7 +31,7 @@ AM_CPPFLAGS+=-I$(top_srcdir)/src -I$(top_srcdir)/java/src/jni $(JNIFLAGS)
lib_LTLIBRARIES=libhdf5_java.la
# Add libtool numbers to the HDF5 Java (JNI) library (from config/lt_vers.am)
-libhdf5_java_la_LDFLAGS= -version-info $(LT_JAVA_VERS_INTERFACE):$(LT_JAVA_VERS_REVISION):$(LT_JAVA_VERS_AGE) $(AM_LDFLAGS)
+libhdf5_java_la_LDFLAGS = -avoid-version -shared -export-dynamic -version-info $(LT_JAVA_VERS_INTERFACE):$(LT_JAVA_VERS_REVISION):$(LT_JAVA_VERS_AGE) $(AM_LDFLAGS)
# Source files for the library
libhdf5_java_la_SOURCES=exceptionImp.c h5Constants.c nativeData.c h5util.c h5Imp.c \
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
diff --git a/tools/test/h5diff/Makefile.am b/tools/test/h5diff/Makefile.am
index 1d700ea..16897c6 100644
--- a/tools/test/h5diff/Makefile.am
+++ b/tools/test/h5diff/Makefile.am
@@ -54,6 +54,7 @@ if HAVE_SHARED_CONDITIONAL
# Build it as shared library if configure is enabled for shared library.
lib_LTLIBRARIES=libdynlibdiff.la
libdynlibdiff_la_SOURCES=dynlib_diff.c
+ libdynlibdiff_la_LDFLAGS = -avoid-version -module -shared -export-dynamic
install-exec-hook:
$(RM) $(DESTDIR)$(libdir)/*dynlib*
diff --git a/tools/test/h5dump/Makefile.am b/tools/test/h5dump/Makefile.am
index a3d1df7..8723c65 100644
--- a/tools/test/h5dump/Makefile.am
+++ b/tools/test/h5dump/Makefile.am
@@ -43,6 +43,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 22c6d96..375df47 100644
--- a/tools/test/h5repack/Makefile.am
+++ b/tools/test/h5repack/Makefile.am
@@ -47,10 +47,14 @@ h5repacktst_SOURCES=h5repacktst.c
if HAVE_SHARED_CONDITIONAL
# Build it as shared library if configure is enabled for shared library.
- noinst_LTLIBRARIES=libdynlibadd.la libdynlibvers.la
+ 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*
endif
# Temporary files. *.h5 are generated by h5repack. They should