2003/09/24 07:33:32

[org.ibex.core.git] / Makefile

diff --git a/Makefile b/Makefile
index d3a6b13..e38b4c2 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -68,16 +68,18 @@ 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
 java_headers          := $(all_java_sources:build/java/%.java=build/h/%.h) 
-build/h/%.h: build/class/%.class
+build/h/%.h: .compile
        @echo -e "\n\033[1mextracting        .class -> .h:     $<\033[0m"
        mkdir -p `dirname $@`
        ls `echo $< | sed s/.class\$$//`*.class |\
@@ -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