From 86ba6c024d03c3cb76ba1a30b6c2317dc4904e64 Mon Sep 17 00:00:00 2001 From: Dave Parker Date: Fri, 17 May 2019 23:54:07 +0100 Subject: [PATCH] Makefile tweak: move JNI header detection into Java section. --- prism/Makefile | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/prism/Makefile b/prism/Makefile index 21ba05b7..cee231aa 100644 --- a/prism/Makefile +++ b/prism/Makefile @@ -139,6 +139,17 @@ JAVA_DIR_BACKUP = $(shell \ #JAVA_DIR = /cygdrive/c/java/j2sdk1.4.2 #JAVA_DIR = /System/Library/Frameworks/JavaVM.framework +# Now we locate the JNI header files jni.h and jni_md.h +# (in fact this is the only reason we need JAVA_DIR) +JAVA_JNI_H_DIR = $(shell \ + if [ -f "$(JAVA_DIR)"/include/jni.h ]; then echo "$(JAVA_DIR)"/include; \ + elif [ -f "$(JAVA_DIR)"/Headers/jni.h ]; then echo "$(JAVA_DIR)"/Headers; \ + elif [ -f "$(JAVA_DIR_BACKUP)"/include/jni.h ]; then echo "$(JAVA_DIR_BACKUP)"/include; \ + elif [ -f "$(JAVA_DIR_BACKUP)"/Headers/jni.h ]; then echo "$(JAVA_DIR_BACKUP)"/Headers; \ + else echo ""; fi ) +JAVA_JNI_MD_H_DIR = $(shell (ls "$(JAVA_JNI_H_DIR)"/jni_md.h "$(JAVA_JNI_H_DIR)"/*/jni_md.h | head -n 1 | sed 's/\/jni_md.h//') 2>/dev/null) +JAVA_INCLUDES = -I $(JAVA_JNI_H_DIR) -I $(JAVA_JNI_MD_H_DIR) + ################## # Compilers etc. # ################## @@ -296,17 +307,6 @@ export CFLAGS CXXFLAGS LDFLAGS JFLAGS LIBPREFIX LIBSUFFIX CUDD_DIR = $(shell if [ -d cudd ]; then echo cudd; else echo ../cudd; fi ) #CUDD_DIR = cudd -# Now we locate the JNI header files jni.h and jni_md.h -# (in fact this is the only reason we need JAVA_DIR) -JAVA_JNI_H_DIR = $(shell \ - if [ -f "$(JAVA_DIR)"/include/jni.h ]; then echo "$(JAVA_DIR)"/include; \ - elif [ -f "$(JAVA_DIR)"/Headers/jni.h ]; then echo "$(JAVA_DIR)"/Headers; \ - elif [ -f "$(JAVA_DIR_BACKUP)"/include/jni.h ]; then echo "$(JAVA_DIR_BACKUP)"/include; \ - elif [ -f "$(JAVA_DIR_BACKUP)"/Headers/jni.h ]; then echo "$(JAVA_DIR_BACKUP)"/Headers; \ - else echo ""; fi ) -JAVA_JNI_MD_H_DIR = $(shell (ls "$(JAVA_JNI_H_DIR)"/jni_md.h "$(JAVA_JNI_H_DIR)"/*/jni_md.h | head -n 1 | sed 's/\/jni_md.h//') 2>/dev/null) -JAVA_INCLUDES = -I $(JAVA_JNI_H_DIR) -I $(JAVA_JNI_MD_H_DIR) - ########################################## # Main part of Makefile: Compiling PRISM # ##########################################