-java_sources := $(handwritten_java_sources:src/%.java=build/java/%.java)
-java_sources += $(handwritten_java_pp_sources:src/%.java.pp=build/java/%.java)
-java_sources += $(handwritten_mips_sources:src/%.mips.c=build/java/%.java)
-java_sources += build/java/org/xwt/Builtin.java
-#java_sources += build/java/org/xwt/imp/Freetype.java
-$(handwritten_java_sources:src/%.java=build/java/%.java): build/java/%.java: src/%.java
- @echo "symlinking: $@"
- @mkdir -p `dirname $@`; \
- cd `dirname $@`; \
- A=`echo $@ | sed 's_[^/]*/_../_g'`; \
- B=`dirname $$A`; \
- C=$$B/$<; \
- ln -s $$C
-
+build/java/%.java: src/%.java ; @echo linking $@; mkdir -p $(@D); ln -s `echo $(@D) | sed 's_[^/]*\(/\|$$\)_../_g'`/$< $@
+build/cc/%.cc: src/%.c ; @echo linking $@; mkdir -p $(@D); ln -s `echo $(@D) | sed 's_[^/]*\(/\|$$\)_../_g'`/$< $@
+build/c/jpeg/%.c: upstream/jpeg-6b/src/%.c
+ @echo linking $@; mkdir -p $(@D); ln -s `echo $(@D) | sed 's_[^/]*\(/\|$$\)_../_g'`/$< $@
+build/c/freetype/%.c: upstream/freetype-2.1.4/src/base/%.c
+ @echo linking $@; mkdir -p $(@D); ln -s `echo $(@D) | sed 's_[^/]*\(/\|$$\)_../_g'`/$< $@
+build/c/freetype/%.c: upstream/freetype-2.1.4/src/%/%.c
+ @echo linking $@; mkdir -p $(@D); ln -s `echo $(@D) | sed 's_[^/]*\(/\|$$\)_../_g'`/$< $@
+
+build/java/%.java: src/%.java.pp build/class/org/xwt/util/Preprocessor.class
+ @echo "preprocessing .java.pp -> .java: $<"
+ @mkdir -p `dirname $@`
+ @rm -f $@
+ @java -cp build/class org.xwt.util.Preprocessor < $< > $@