diff options
Diffstat (limited to 'src/runtime')
| -rw-r--r-- | src/runtime/c/Makefile.am | 5 | ||||
| -rw-r--r-- | src/runtime/c/sg/sqlite3Btree.c | 1 | ||||
| -rw-r--r-- | src/runtime/java/INSTALL | 12 | ||||
| -rw-r--r-- | src/runtime/java/Makefile | 2 |
4 files changed, 12 insertions, 8 deletions
diff --git a/src/runtime/c/Makefile.am b/src/runtime/c/Makefile.am index edc4f88b2..8f9c8bf56 100644 --- a/src/runtime/c/Makefile.am +++ b/src/runtime/c/Makefile.am @@ -87,13 +87,14 @@ libpgf_la_SOURCES = \ pgf/graphviz.c \ pgf/aligner.c \ pgf/pgf.c \ - pgf/pgf.h \ -libpgf_la_LDFLAGS = "-no-undefined" + pgf/pgf.h +libpgf_la_LDFLAGS = -no-undefined libpgf_la_LIBADD = libgu.la libsg_la_SOURCES = \ sg/sqlite3Btree.c \ sg/sg.c +libsg_la_LDFLAGS = -no-undefined libsg_la_LIBADD = libgu.la libpgf.la bin_PROGRAMS = diff --git a/src/runtime/c/sg/sqlite3Btree.c b/src/runtime/c/sg/sqlite3Btree.c index a75cfd62b..ee6bd206a 100644 --- a/src/runtime/c/sg/sqlite3Btree.c +++ b/src/runtime/c/sg/sqlite3Btree.c @@ -4918,6 +4918,7 @@ SQLITE_PRIVATE int sqlite3PendingByte; # define SQLITE_UTF16NATIVE SQLITE_UTF16BE #endif #if !defined(SQLITE_BYTEORDER) +const int sqlite3one = 1; # define SQLITE_BYTEORDER 0 /* 0 means "unknown at compile-time" */ # define SQLITE_BIGENDIAN (*(char *)(&sqlite3one)==0) # define SQLITE_LITTLEENDIAN (*(char *)(&sqlite3one)==1) diff --git a/src/runtime/java/INSTALL b/src/runtime/java/INSTALL index 6d97dd279..c0e91a355 100644 --- a/src/runtime/java/INSTALL +++ b/src/runtime/java/INSTALL @@ -1,10 +1,12 @@ -Before compiling the Java binding you first need to have the C runtime +Before compiling the Java binding you first need to have the C runtime compiled and installed. You also need to find where your jni.h header is installed. It is part of the Java JDK, but it might be placed -in different places on different platforms. The path to the jni.h -header should be assigned to the JNI_PATH variable in the beginning -of the Makefile that you will find in the root directory of -the binding. Once this is done type: +in different places on different platforms. +The Makefile in this directory will try to figure out the location of +jni.h, but if it doesn't succeed you should add it manually to the +JNI_INCLUDES variable in the beginning of the Makefile. + +Once this is done type: $ make $ make install diff --git a/src/runtime/java/Makefile b/src/runtime/java/Makefile index b7a7264cc..02083ddac 100644 --- a/src/runtime/java/Makefile +++ b/src/runtime/java/Makefile @@ -3,7 +3,7 @@ JAVA_SOURCES = $(wildcard org/grammaticalframework/pgf/*.java) \ $(wildcard org/grammaticalframework/sg/*.java) 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, \ + $(if $(wildcard /System/Library/Frameworks/JavaVM.framework/Versions/A/Headers/.*), -I/System/Library/Frameworks/JavaVM.framework/Versions/A/Headers, \ $(if $(wildcard /Library/Java/Home/include/.*), -I/Library/Java/Home/include/ -I/Library/Java/Home/include/darwin, \ $(error No JNI headers found)))) |