diff options
author | Vailin Choi <vchoi@hdfgroup.org> | 2017-04-19 21:06:25 (GMT) |
---|---|---|
committer | Vailin Choi <vchoi@hdfgroup.org> | 2017-04-19 21:06:25 (GMT) |
commit | 53f1450f9d49458c110cf19df340df7025fa7bca (patch) | |
tree | 71ec9205b2b81109708b744487ce6816445a60e8 /java/src/jni/Makefile.am | |
parent | c2ab87e2b6bbc64150c35a7047e210c267d1819f (diff) | |
parent | 8f34c3cfd46054f6478b34df6af324c353e44d62 (diff) | |
download | hdf5-53f1450f9d49458c110cf19df340df7025fa7bca.zip hdf5-53f1450f9d49458c110cf19df340df7025fa7bca.tar.gz hdf5-53f1450f9d49458c110cf19df340df7025fa7bca.tar.bz2 |
Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit '8f34c3cfd46054f6478b34df6af324c353e44d62':
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 'java/src/jni/Makefile.am')
-rw-r--r-- | java/src/jni/Makefile.am | 2 |
1 files changed, 1 insertions, 1 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 \ |