-java_objects := $(filter-out bin-$(platform)/org/xwt/plat/%, $(java_sources:src/%.java=bin-$(platform)/%.java.o))
-java_objects += $(filter-out bin-$(platform)/org/xwt/plat/%, $(java_pp_postproc:bin/%.java=bin-$(platform)/%.java.o))
-java_objects += bin-$(platform)/org/xwt/plat/GCJ.java.o
-java_objects += $(platform_java_sources:%=bin-$(platform)/org/xwt/plat/%.java.o)
-cc_objects := $(cc_sources:src/%.cc=bin-$(platform)/%.cc.o)
-c_objects := $(c_sources:src/%.c=bin-$(platform)/%.c.o)
+java_objects := $(filter-out build/$(platform)/org/xwt/plat/%, $(java_sources:src/%.java=build/$(platform)/%.java.o))
+java_objects += $(java_generated_sources:build/java/%.java=build/$(platform)/%.java.o)
+java_objects += build/$(platform)/org/xwt/plat/GCJ.java.o
+java_objects += $(platform_java_sources:%=build/$(platform)/org/xwt/plat/%.java.o)
+cc_objects := $(cc_sources:src/%.cc=build/$(platform)/%.cc.o)
+c_objects := $(c_sources:src/%.c=build/$(platform)/%.c.o)