From 11d850fb5faa6fd130912dfea9eef4336acc7649 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Wed, 17 Jul 2024 23:35:32 +0200 Subject: Update for libgamma 0.7.4 and fix bugs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index a7b4217..0b24d91 100644 --- a/Makefile +++ b/Makefile @@ -44,6 +44,8 @@ OBJ =\ libgamma_Ramp.o\ libgamma_Site.o +NATIVE_CLASSES = $$(printf '%s\n' $(OBJ:.o=) | sed 's/_/\./g' | tr '\n' ' ') + JAVA_HDR = $(OBJ:.o=.h) JAVA_SRC = $(CLASS:.class=.java) @@ -55,10 +57,10 @@ $(OBJ): $(JAVA_HDR) $(CLASS) $(JAVA_HDR): $(JAVA_SRC) @set -e;\ if $(JAVAH) -version 2>/dev/null >/dev/null; then\ - printf '%s\n' "$(JAVAH) -jni -d . -cp . $(JPKG).EQNative";\ - $(JAVAH) -jni -d . -cp . $(JPKG).EQNative;\ printf '%s\n' "$(JAVAC) '-Xlint:all' -O -cp . -d . $(JAVA_SRC)";\ $(JAVAC) '-Xlint:all' -O -cp . -d . $(JAVA_SRC);\ + printf '%s\n' "$(JAVAH) -jni -d . -cp . $(NATIVE_CLASSES)";\ + $(JAVAH) -jni -d . -cp . $(NATIVE_CLASSES);\ else\ printf '%s\n' "$(JAVAC) '-Xlint:all' -O -h . -cp . -d . $(JAVA_SRC)";\ $(JAVAC) '-Xlint:all' -O -h . -cp . -d . $(JAVA_SRC);\ -- cgit v1.2.3-70-g09d2