diff -r 460af5af2128 javafx-font-native/Makefile --- a/javafx-font-native/Makefile Tue May 29 13:36:51 2012 -0700 +++ b/javafx-font-native/Makefile Wed May 30 09:46:32 2012 -0700 @@ -47,6 +47,9 @@ ifndef JFXFONT_CP JFXFONT_CP = ../javafx-font/build/classes endif +ifndef JFXFONT_JAVA + JFXFONT_JAVA = ../javafx-font/src +endif ifndef JAVAH_CP JAVAH_CP = "../javafx-font/build/classes:../javafx-geom/build/classes" endif @@ -65,7 +68,7 @@ JFXFONT_PKG = com.sun.t2k JFXFONT_PKG_PATH = $(subst .,/,$(JFXFONT_PKG)) JFXFONT_JNI_PKG = $(subst .,_,$(JFXFONT_PKG)) -JNI_INCLUDES := $(patsubst $(JFXFONT_CP)/$(JFXFONT_PKG_PATH)/%.class,$(BUILD_DIR)/$(JFXFONT_JNI_PKG)_%.h,$(wildcard $(JFXFONT_CP)/$(JFXFONT_PKG_PATH)/*.class)) +JNI_INCLUDES := $(patsubst $(JFXFONT_JAVA)/$(JFXFONT_PKG_PATH)/%.java,$(BUILD_DIR)/$(JFXFONT_JNI_PKG)_%.h,$(wildcard $(JFXFONT_JAVA)/$(JFXFONT_PKG_PATH)/*.java)) INCLUDES = $(wildcard $(JFXFONT_INCLUDE)/*.h) SYSTEM_UNAME := $(shell uname)