diff options
| author | Thomas Hallgren <hallgren@chalmers.se> | 2017-08-11 15:09:28 +0200 |
|---|---|---|
| committer | Thomas Hallgren <hallgren@chalmers.se> | 2017-08-11 15:09:28 +0200 |
| commit | 9a39476e5a1a032a265358fac2973ecd3d42be12 (patch) | |
| tree | 87dddfb4635bf65d94849754a419c8f7698c1750 | |
| parent | a0e7e3bf83d492782e8d87180dfd892115b09899 (diff) | |
src/runtime/java/Makefile: fixes to find jni.h and jni_md.h in more cases
| -rw-r--r-- | src/runtime/java/Makefile | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/runtime/java/Makefile b/src/runtime/java/Makefile index 68855274b..b7a7264cc 100644 --- a/src/runtime/java/Makefile +++ b/src/runtime/java/Makefile @@ -2,9 +2,10 @@ C_SOURCES = jpgf.c jsg.c jni_utils.c JAVA_SOURCES = $(wildcard org/grammaticalframework/pgf/*.java) \ $(wildcard org/grammaticalframework/sg/*.java) -JNI_PATH = $(if $(wildcard /usr/lib/jvm/default-java/include/.*), /usr/lib/jvm/default-java/include, \ +JNI_INCLUDES = $(if $(wildcard /usr/lib/jvm/default-java/include/.*), -I/usr/lib/jvm/default-java/include -I/usr/lib/jvm/default-java/include/linux, \ $(if $(wildcard /System/Library/Frameworks/JavaVM.framework/Versions/A/Headers/.*), /System/Library/Frameworks/JavaVM.framework/Versions/A/Headers, \ - $(error No JNI headers found))) + $(if $(wildcard /Library/Java/Home/include/.*), -I/Library/Java/Home/include/ -I/Library/Java/Home/include/darwin, \ + $(error No JNI headers found)))) INSTALL_PATH = /usr/local/lib LIBTOOL = glibtool --tag=CC @@ -17,7 +18,7 @@ libjpgf.la: $(patsubst %.c, %.lo, $(C_SOURCES)) $(LIBTOOL) --mode=link gcc $(CFLAGS) -g -O -o libjpgf.la -shared $^ -rpath $(INSTALL_PATH) -lgu -lpgf -lsg %.lo : %.c - $(LIBTOOL) --mode=compile gcc $(CFLAGS) -g -O -c -I$(JNI_PATH) -std=c99 -shared $< -o $@ + $(LIBTOOL) --mode=compile gcc $(CFLAGS) -g -O -c $(JNI_INCLUDES) -std=c99 -shared $< -o $@ jpgf.jar: $(patsubst %.java, %.class, $(JAVA_SOURCES)) jar -cf $@ org/grammaticalframework/pgf/*.class org/grammaticalframework/sg/*.class |