X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=70ef00dd1e971359e330b2df4fe85db892860618;hb=77091a0ecab02cafc3610508a59347aeadcb922e;hp=d3a6b135dddb87248abee7cbfb09e8a8be28d570;hpb=8ea2f2734a60f0c4fa9c82083469165283a8b810;p=org.ibex.core.git

diff --git a/Makefile b/Makefile
index d3a6b13..70ef00d 100644
--- a/Makefile
+++ b/Makefile
@@ -68,11 +68,13 @@ build/class/%.class: build/java/%.java .jikes
 	mkdir -p build/class
 	./.jikes $<
 
+# this forces a clean build every time because jikes is so damn buggy
 compile: .compile
-.compile: $(all_java_sources)
+.compile: $(all_java_sources) .jikes
 	@echo -e "\n\033[1mcompiling          .java -> .class: src/**/*.java\033[0m"
+	rm -rf build/class
 	mkdir -p build/class
-	@./.jikes $^
+	@./.jikes $(all_java_sources)
 	touch .compile
 
 # PHASE 4: gcj-generated headers
@@ -151,7 +153,7 @@ build/$(platform)/builtin.o: build/res/builtin.jar
 # having the individual .o's depend on the .java's (otherwise every .o gets recompiled when one .java changes)
 gcj: .vendor .install_gcc-3.3_$(target) $(target_bin)
 
-build/JVM/xwt.jar: $(java_sources:build/java/%.java=build/class/%.class) build/res/builtin.jar
+build/JVM/xwt.jar: .compile build/res/builtin.jar
 	@echo -e "\n\033[1marchiving         .class -> .jar:   build/JVM/xwt.jar\033[0m"
 	mkdir -p build/JVM
 	echo -e "Manifest-Version: 1.0\nMain-Class: org.xwt.Main\n" > build/JVM/.manifest