mkdir -p `dirname $@`
$(gcj) -c $< -o $@
-build/$(platform)/org/xwt/plat/$(platform).cc.o: src/org/xwt/plat/$(platform).cc src/org/xwt/plat/*.cc $(java_headers) .configure_jpeg-6b_$(target)
+headers: $(java_headers)
+
+build/$(platform)/org/xwt/plat/$(platform).cc.o: src/org/xwt/plat/$(platform).cc src/org/xwt/plat/*.cc .configure_jpeg-6b_$(target)
+ @make headers
@echo -e "\n\033[1mcompiling .cc -> .o: $<\033[0m"
mkdir -p `dirname $@`
$(g++) -Iupstream/install/lib/gcc-lib/$(target)/3.3/include/ -Iupstream/install/$(target)/include -I/usr/X11R6/include/ -Ibuild/h -Wno-multichar -Iupstream/install/include -c $< -o $@
jpeg_sources += jquant1.c jquant2.c jerror.c jutils.c jmemnobs.c jmemmgr.c
upstream/jpeg-6b/build-$(target)/libjpeg.a: .install_jpeg-6b_$(target)
-java_objects := $(java_sources:build/java/%.java=build/$(platform)/%.java.o)
+java_objects := $(nonplat_java_sources:build/java/%.java=build/$(platform)/%.java.o)
-$(target_bin): $(java_objects) upstream/jpeg-6b/build-$(target)/libjpeg.a build/$(platform)/org/xwt/plat/$(platform).cc.o build/$(platform)/org/xwt/builtin.res.o build/$(platform)/freetype.res.o
+$(target_bin): $(java_objects) upstream/jpeg-6b/build-$(target)/libjpeg.a build/$(platform)/org/xwt/plat/$(platform).cc.o build/$(platform)/org/xwt/builtin.res.o build/$(platform)/freetype.res.o $(plat_java_sources:build/java/%.java=build/$(platform)/%.java.o)
@echo -e "\n\033[1mlinking .o -> $(target_bin)\033[0m"
mkdir -p build/$(platform)
- upstream/install/bin/$(target)-ar rcs $(platform).ar $(plat_java_sources:build/java/%.java=build/$(platform)/%.java.o)
- PATH=upstream/install/bin:$$PATH $(gcj) -v --main=org.xwt.Main -o build/$(platform)/$(target_bin) $^ $(jpeg_sources:%.c=upstream/jpeg-6b/build-$(target)/%.o) -Lupstream/install/$(target)/lib $(link_flags) build/$(platform)/org/xwt/plat/$(platform).java.o $(platform).ar
+ upstream/install/bin/$(target)-ar rcs $(platform).ar $^
+ PATH=upstream/install/bin:$$PATH $(gcj) -v --main=org.xwt.Main -o build/$(platform)/$(target_bin) $(jpeg_sources:%.c=upstream/jpeg-6b/build-$(target)/%.o) -Lupstream/install/$(target)/lib $(link_flags) $(platform).ar build/$(platform)/org/xwt/plat/$(platform).java.o
##############################################################################