diff options
| author | hallgren <hallgren@chalmers.se> | 2016-04-25 14:21:04 +0000 |
|---|---|---|
| committer | hallgren <hallgren@chalmers.se> | 2016-04-25 14:21:04 +0000 |
| commit | 41171be5a6473eeb5de42e3f2c0e20c854d1481a (patch) | |
| tree | cff48433a0be9e9ca3c8ae3f070c2cba880d0424 /src | |
| parent | 983da7adfc714f7e15fc14aeeb103f273fe0b57e (diff) | |
Fix a problem building the Java binding when creating binary packages
Pass -I and -L flags to gcc so that the C run-time system can be found.
Also added a line in src/runtime/java/Makefile to install jpgf.jar.
Diffstat (limited to 'src')
| -rw-r--r-- | src/runtime/java/Makefile | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/runtime/java/Makefile b/src/runtime/java/Makefile index 8310a5720..6bf0d1495 100644 --- a/src/runtime/java/Makefile +++ b/src/runtime/java/Makefile @@ -12,10 +12,10 @@ LIBTOOL = $(if $(shell command -v glibtool 2>/dev/null), glibtool --tag=CC, libt all: libjpgf.la jpgf.jar libjpgf.la: $(patsubst %.c, %.lo, $(C_SOURCES)) - $(LIBTOOL) --mode=link gcc -g -O -o libjpgf.la -shared $^ -rpath $(INSTALL_PATH) -lgu -lpgf -lsg + $(LIBTOOL) --mode=link gcc $(CFLAGS) -g -O -o libjpgf.la -shared $^ -rpath $(INSTALL_PATH) -lgu -lpgf -lsg %.lo : %.c - $(LIBTOOL) --mode=compile gcc -g -O -c -I$(JNI_PATH) -std=c99 -shared $< -o $@ + $(LIBTOOL) --mode=compile gcc $(CFLAGS) -g -O -c -I$(JNI_PATH) -std=c99 -shared $< -o $@ jpgf.jar: $(patsubst %.java, %.class, $(JAVA_SOURCES)) jar -cf $@ org/grammaticalframework/pgf/*.class org/grammaticalframework/sg/*.class @@ -25,6 +25,8 @@ jpgf.jar: $(patsubst %.java, %.class, $(JAVA_SOURCES)) install: libjpgf.la jpgf.jar $(LIBTOOL) --mode=install install -s libjpgf.la $(INSTALL_PATH) + install jpgf.jar $(INSTALL_PATH) + doc: javadoc org.grammaticalframework.pgf org.grammaticalframework.sg -d java-api |