X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=9c68fe330fa52b394a690b7f5cba000e263b615d;hb=259bc29e846fc13082bd434862a73cf0644c25f2;hp=4de2701bd7d1a8690d943bef8c08b52f618484f4;hpb=8ad8837b741bd77cd8aeef1881159ad839ce3828;p=org.ibex.core.git

diff --git a/Makefile b/Makefile
index 4de2701..9c68fe3 100644
--- a/Makefile
+++ b/Makefile
@@ -156,7 +156,8 @@ build/$(platform)/org/xwt/plat/$(platform).cc.o: src/org/xwt/plat/$(platform).cc
 	mkdir -p `dirname $@`
 	$(g++) -c $< -o $@
 
-build/$(platform)/$(platform).ar: $(java_sources:build/java/%.java=build/$(platform)/%.java.o)
+nonplat_java_sources := $(filter-out build/java/org/xwt/plat/$(platform).java,$(java_sources))
+build/$(platform)/$(platform).ar: $(nonplat_java_sources:build/java/%.java=build/$(platform)/%.java.o)
 	@echo -e "\n\033[1marchiving             .o -> .a\033[0m"
 	mkdir -p build/$(platform)
 	rm -f $@
@@ -164,10 +165,10 @@ build/$(platform)/$(platform).ar: $(java_sources:build/java/%.java=build/$(platf
 	upstream/install/$(target)/bin/ranlib $@
 
 upstream/jpeg-6b/build-$(target)/libjpeg.a: .install_jpeg-6b_$(target)
-build/$(platform)/$(target_bin): build/$(platform)/org/xwt/plat/$(platform).cc.o upstream/jpeg-6b/build-$(target)/libjpeg.a build/$(platform)/builtin.o build/$(platform)/$(platform).ar 
+build/$(platform)/$(target_bin): build/$(platform)/org/xwt/plat/$(platform).cc.o upstream/jpeg-6b/build-$(target)/libjpeg.a build/$(platform)/builtin.o build/$(platform)/$(platform).ar build/$(platform)/org/xwt/plat/$(platform).java.o
 	@echo -e "\n\033[1mlinking               .o -> $(target_bin)\033[0m"
 	mkdir -p build/$(platform)
-	PATH=upstream/install/bin:$$PATH $(gcj) -v --main=org.xwt.Main -o $@ -Lupstream/install/$(target)/lib build/$(platform)/org/xwt/plat/$(platform).java.o $^ $(link_flags)
+	PATH=upstream/install/bin:$$PATH $(gcj) -v --main=org.xwt.Main -o $@ -Lupstream/install/$(target)/lib $^ $(link_flags)
 
 
 ### Builtin Resources ##############################################################################