aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorMattias Andrée <maandree@kth.se>2024-07-17 23:35:32 +0200
committerMattias Andrée <maandree@kth.se>2024-07-17 23:35:32 +0200
commit11d850fb5faa6fd130912dfea9eef4336acc7649 (patch)
treee0e9adfbbaefbbca7ad4cf3dfa6e49fab2e1e5c0 /Makefile
parentEmpty signed commit (diff)
downloadjlibgamma-11d850fb5faa6fd130912dfea9eef4336acc7649.tar.gz
jlibgamma-11d850fb5faa6fd130912dfea9eef4336acc7649.tar.bz2
jlibgamma-11d850fb5faa6fd130912dfea9eef4336acc7649.tar.xz
Update for libgamma 0.7.4 and fix bugs
Signed-off-by: Mattias Andrée <maandree@kth.se>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile6
1 files changed, 4 insertions, 2 deletions
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);\