diff -r c10ce02d8477 javafx-font-native/Makefile
--- a/javafx-font-native/Makefile	Mon May 14 11:42:14 2012 -0700
+++ b/javafx-font-native/Makefile	Tue May 15 13:11:57 2012 -0700
@@ -45,7 +45,7 @@
 	BUILD_DIR	= build
 endif
 ifndef JFXFONT_CP
-	JFXFONT_CP	= ../javafx-font/build/classes
+	JFXFONT_CP	= ../javafx-font/src
 endif
 ifndef JAVAH_CP
     JAVAH_CP		= "../javafx-font/build/classes:../javafx-geom/build/classes"
@@ -65,9 +65,8 @@
 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))
-INCLUDES	= \
-	$(JFXFONT_INCLUDE)/t2k.h
+JNI_INCLUDES := $(patsubst $(JFXFONT_CP)/$(JFXFONT_PKG_PATH)/%.java,$(BUILD_DIR)/$(JFXFONT_JNI_PKG)_%.h,$(wildcard $(JFXFONT_CP)/$(JFXFONT_PKG_PATH)/*.java))
+INCLUDES = $(wildcard $(JFXFONT_INCLUDE)/*.h)
 
 SYSTEM_UNAME := $(shell uname)
 JAVAH_FIX_CP = $(JAVAH_CP)
@@ -173,22 +172,14 @@
 	LINK_PARAMS	= -framework ApplicationServices -framework AppKit -framework JavaVM -framework JavaNativeFoundation -F/System/Library/Frameworks/JavaVM.framework/Frameworks -dynamiclib $(COMMON_PARAMS) -o $(JFXFONT_LIB) -lobjc
 
 	CC_PARAMS	= -O2 -ffast-math -Fd$(BUILD_DIR) $(COMMON_PARAMS) -DJFXFONT_PLUS -I/System/Library/Frameworks/JavaVM.framework/Frameworks/JavaNativeFoundation.framework/Headers -I$(JFXFONT_SRC) -I$(JFXFONT_INCLUDE) -I$(BUILD_DIR) -I$(JDK_HOME)/include -I$(JDK_HOME)/include/darwin -c
+	
+	OBJS += $(patsubst $(JFXFONT_SRC)/%.m,$(BUILD_DIR)/%.$(OBJ_SUFFIX),$(wildcard $(JFXFONT_SRC)/*.m))
+
 endif
 
-OBJS		:= $(patsubst $(JFXFONT_SRC)/%.c,$(BUILD_DIR)/%.$(OBJ_SUFFIX),$(wildcard $(JFXFONT_SRC)/*.c))
-OBJS		+= \
-	$(BUILD_DIR)/t2k.$(OBJ_SUFFIX)
-CPPOBJS		:= $(patsubst $(JFXFONT_SRC)/%.cpp,$(BUILD_DIR)/%.$(OBJ_SUFFIX),$(wildcard $(JFXFONT_SRC)/*.cpp))
-OBJS		+= $(CPPOBJS)
-OBJS		+= \
-	$(BUILD_DIR)/t2k.$(OBJ_SUFFIX)
 
-ifeq ($(SYSTEM_UNAME), Darwin)
-OBJCOBJS	:= $(patsubst $(JFXFONT_SRC)/%.m,$(BUILD_DIR)/%.$(OBJ_SUFFIX),$(wildcard $(JFXFONT_SRC)/*.m))
-OBJS		+= $(OBJCOBJS)
-OBJS		+= \
-	$(BUILD_DIR)/MacFontFinder.$(OBJ_SUFFIX)
-endif
+OBJS += $(patsubst $(JFXFONT_SRC)/%.c,$(BUILD_DIR)/%.$(OBJ_SUFFIX),$(wildcard $(JFXFONT_SRC)/*.c))
+OBJS += $(patsubst $(JFXFONT_SRC)/%.cpp,$(BUILD_DIR)/%.$(OBJ_SUFFIX),$(wildcard $(JFXFONT_SRC)/*.cpp))
 
 JAVAH	= $(call fix_path,-u,$(JDK_HOME)/bin/javah)
 
@@ -204,21 +195,16 @@
 $(JFXFONT_LIB) : $(OBJS)
 	$(LINK) $(LINK_PARAMS) $^
 
-$(BUILD_DIR)/%.$(OBJ_SUFFIX) : %.c $(JNI_INCLUDES) $(INCLUDES)
-	$(CC) $(CC_PARAMS) $(OUTPUT_FLAG)$@ $<
-
 $(BUILD_DIR)/%.$(OBJ_SUFFIX) : $(JFXFONT_SRC)/%.cpp $(JNI_INCLUDES) $(INCLUDES)
 	$(CC) $(CC_PARAMS) $(OUTPUT_FLAG)$@ $<
 
 $(BUILD_DIR)/%.$(OBJ_SUFFIX) : $(JFXFONT_SRC)/%.c $(JNI_INCLUDES) $(INCLUDES)
 	$(CC) $(CC_PARAMS) $(OUTPUT_FLAG)$@ $<
 
-ifeq ($(SYSTEM_UNAME), Darwin)
-$(BUILD_DIR)/MacFontFinder.$(OBJ_SUFFIX) : $(JFXFONT_SRC)/MacFontFinder.m $(JNI_INCLUDES) $(INCLUDES)
+$(BUILD_DIR)/%.$(OBJ_SUFFIX) : $(JFXFONT_SRC)/%.m $(JNI_INCLUDES) $(INCLUDES)
 	$(CC) $(CC_PARAMS) $(OUTPUT_FLAG)$@ $<
-endif
 
-$(BUILD_DIR)/$(JFXFONT_JNI_PKG)_%.h : $(JFXFONT_CP)/$(JFXFONT_PKG_PATH)/%.class
+$(BUILD_DIR)/$(JFXFONT_JNI_PKG)_%.h : $(JFXFONT_CP)/$(JFXFONT_PKG_PATH)/%.java
 	$(JAVAH) -force -o $@ -jni -classpath "$(JAVAH_FIX_CP)" $(JFXFONT_PKG).$*
 
 sanity:
diff -r c10ce02d8477 javafx-font/build.xml
--- a/javafx-font/build.xml	Mon May 14 11:42:14 2012 -0700
+++ b/javafx-font/build.xml	Tue May 15 13:11:57 2012 -0700
@@ -12,7 +12,7 @@
   <property name="native.build.dir" value="../javafx-font-native/build${cross.name.suffix}"/>
   <property name="native.makefile" value="Makefile"/>
   <property name="javafx-font.javah.path" value="../javafx-font/build/classes:../javafx-geom/build/classes"/>
-  <property name="javafx-font.classes.dir" value="../javafx-font/build/classes"/>
+  <property name="javafx-font.classes.dir" value="../javafx-font/src"/>
   <property name="nativelib.suffix.macosx" value=".dylib"/>
 
   <target name="get-libname-macosx" if="isMacOSX">
@@ -33,7 +33,7 @@
 
   <target name="check-native">
     <uptodate property="native.uptodate" targetfile="${native.dist.dir}/${native.lib.file}" >
-      <srcfiles dir= "${cpp.dir}/src" includes="*.c *.cpp"/>
+      <srcfiles dir= "${cpp.dir}/src" includes="*.m *.c *.cpp"/>
     </uptodate>
   </target>