68 lines
3.2 KiB
Diff
68 lines
3.2 KiB
Diff
diff -up hdf-4.2.14/java/examples/Makefile.am.build hdf-4.2.14/java/examples/Makefile.am
|
|
--- hdf-4.2.14/java/examples/Makefile.am.build 2018-06-26 22:42:58.000000000 -0600
|
|
+++ hdf-4.2.14/java/examples/Makefile.am 2019-04-10 20:01:42.336828053 -0600
|
|
@@ -12,8 +12,8 @@ classes:
|
|
test -d $(@D)/$(JAVAROOT) || $(MKDIR_P) $(@D)/$(JAVAROOT)
|
|
|
|
pkgpath = examples
|
|
-hdfjarfile = jar$(PACKAGE_TARNAME)-$(PACKAGE_VERSION).jar
|
|
-jarfile = jar$(PACKAGE_TARNAME)examples.jar
|
|
+hdfjarfile = $(PACKAGE_TARNAME).jar
|
|
+jarfile = $(PACKAGE_TARNAME)examples.jar
|
|
|
|
CLASSPATH_ENV=CLASSPATH=.:$(JAVAROOT):$(top_builddir)/java/src/$(hdfjarfile):$(top_srcdir)/java/lib/slf4j-api-1.7.5.jar:$(top_srcdir)/java/lib/ext/slf4j-simple-1.7.5.jar:$$CLASSPATH
|
|
AM_JAVACFLAGS = $(H4_JAVACFLAGS) -deprecation
|
|
diff -up hdf-4.2.14/java/src/jni/Makefile.am.build hdf-4.2.14/java/src/jni/Makefile.am
|
|
--- hdf-4.2.14/java/src/jni/Makefile.am.build 2018-06-26 22:42:58.000000000 -0600
|
|
+++ hdf-4.2.14/java/src/jni/Makefile.am 2019-04-10 20:47:55.397873538 -0600
|
|
@@ -14,7 +14,10 @@ AM_CPPFLAGS=-I$(top_srcdir)/hdf/src
|
|
-I$(top_builddir)/mfhdf/libsrc -I$(top_srcdir)/java/src/jni $(JNIFLAGS)
|
|
|
|
# This is our main target
|
|
-lib_LTLIBRARIES=libhdf_java.la
|
|
+pkglib_LTLIBRARIES=libhdf_java.la
|
|
+
|
|
+# No soname for JNI library
|
|
+libhdf_java_la_LDFLAGS = -avoid-version
|
|
|
|
# Source files for the library
|
|
libhdf_java_la_SOURCES=hdfanImp.c hdfdfpalImp.c \
|
|
diff -up hdf-4.2.14/java/src/Makefile.am.build hdf-4.2.14/java/src/Makefile.am
|
|
--- hdf-4.2.14/java/src/Makefile.am.build 2018-06-26 22:42:58.000000000 -0600
|
|
+++ hdf-4.2.14/java/src/Makefile.am 2019-04-10 20:01:42.336828053 -0600
|
|
@@ -13,8 +13,8 @@ JAVAROOT = .classes
|
|
classes:
|
|
test -d $(@D)/$(JAVAROOT) || $(MKDIR_P) $(@D)/$(JAVAROOT)
|
|
|
|
-jarfile = jar$(PACKAGE_TARNAME)-$(PACKAGE_VERSION).jar
|
|
-hdf_javadir = $(libdir)
|
|
+jarfile = $(PACKAGE_TARNAME).jar
|
|
+hdf_javadir = $(prefix)/lib/java
|
|
|
|
pkgpath = hdf/hdflib
|
|
CLASSPATH_ENV=CLASSPATH=.:$(top_srcdir)/java/lib/slf4j-api-1.7.5.jar:$$CLASSPATH
|
|
diff -up hdf-4.2.14/java/test/junit.sh.in.build hdf-4.2.14/java/test/junit.sh.in
|
|
--- hdf-4.2.14/java/test/junit.sh.in.build 2018-06-26 22:42:58.000000000 -0600
|
|
+++ hdf-4.2.14/java/test/junit.sh.in 2019-04-10 20:01:42.337828056 -0600
|
|
@@ -40,7 +40,7 @@ HDFLIB_HOME="$top_srcdir/java/lib"
|
|
BLDLIBDIR="$top_builddir/java/lib"
|
|
BLDDIR="."
|
|
HDFTEST_HOME="$top_srcdir/java/test"
|
|
-JARFILE=jar@PACKAGE_TARNAME@-@PACKAGE_VERSION@.jar
|
|
+JARFILE=@PACKAGE_TARNAME@.jar
|
|
TESTJARFILE=jar@PACKAGE_TARNAME@test.jar
|
|
test -d $BLDLIBDIR || mkdir -p $BLDLIBDIR
|
|
|
|
diff -up hdf-4.2.14/java/test/Makefile.am.build hdf-4.2.14/java/test/Makefile.am
|
|
--- hdf-4.2.14/java/test/Makefile.am.build 2018-06-26 22:42:58.000000000 -0600
|
|
+++ hdf-4.2.14/java/test/Makefile.am 2019-04-10 20:01:42.337828056 -0600
|
|
@@ -12,7 +12,7 @@ classes:
|
|
test -d $(@D)/$(JAVAROOT) || $(MKDIR_P) $(@D)/$(JAVAROOT)
|
|
|
|
pkgpath = test
|
|
-hdfjarfile = jar$(PACKAGE_TARNAME)-$(PACKAGE_VERSION).jar
|
|
+hdfjarfile = $(PACKAGE_TARNAME).jar
|
|
CLASSPATH_ENV=CLASSPATH=.:$(JAVAROOT):$(top_builddir)/java/src/$(hdfjarfile):$(top_srcdir)/java/lib/junit.jar:$(top_srcdir)/java/lib/hamcrest-core.jar:$(top_srcdir)/java/lib/slf4j-api-1.7.5.jar:$(top_srcdir)/java/lib/ext/slf4j-simple-1.7.5.jar:$$CLASSPATH
|
|
|
|
jarfile = jar$(PACKAGE_TARNAME)test.jar
|