2003/11/17 01:53:25

[org.ibex.core.git] / Makefile

diff --git a/Makefile b/Makefile
index ea56dea..83efe78 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -46,12 +46,12 @@ jar                    := $(shell ((type fastjar &>/dev/null) && echo fastjar) |
 include Makefile.upstream
 
 # figure out what stuff in org.xwt.plat.* this platform requires (its superclasses)
-all_java_sources  := $(filter-out build/java/org/xwt/mips/%, $(patsubst src/%.java,     build/java/%.java, $(shell find src -name '*.java')))
-all_java_sources  += build/java/org/xwt/translators/FreetypeVM.java
+java_sources      := $(patsubst src/%.java,     build/java/%.java, $(shell find src -name '*.java' \! -path 'src/org/xwt/mips/*'))
+java_sources      += build/java/org/xwt/translators/FreetypeVM.java
+all_java_sources  := $(java_sources)
 
-java_sources      := $(all_java_sources)
-nonplat_java_sources      := $(filter-out build/java/org/xwt/plat/%, $(all_java_sources))
-plat_java_sources      := $(filter build/java/org/xwt/plat/%, $(all_java_sources))
+nonplat_java_sources      := $(filter-out build/java/org/xwt/plat/%, $(java_sources))
+plat_java_sources         := $(filter build/java/org/xwt/plat/%, $(java_sources))
 
 build/java/org/xwt/translators/FreetypeVM.java: build/res/freetype.mips build/class/org/xwt/mips/Compiler.class
        mkdir -p build/java/org/xwt/translators
@@ -76,20 +76,20 @@ build/class/org/xwt/util/Preprocessor.class: src/org/xwt/util/Preprocessor.java
        mkdir -p build/class/org/xwt/util/
        ./.jikes $<
 
-build/class/org/xwt/mips/Compiler.class: src/org/xwt/mips/*.* .jikes
+build/class/org/xwt/mips/Compiler.class: src/org/xwt/mips/*.java
+       make .jikes
        @echo -e "\n\033[1mcompiling          .java -> .class: $<\033[0m"
        mkdir -p build/class/org/xwt/mips/
        ./.jikes $<
 
-
 # this forces a clean build every time because jikes is so damn buggy
-preprocess: $(all_java_sources)
+preprocess: $(java_sources)
 compile: .compile
-.compile: $(all_java_sources) .jikes
+.compile: $(java_sources) .jikes 
        @echo -e "\n\033[1mcompiling          .java -> .class: src/**/*.java\033[0m"
-       rm -rf build/class
+       @rm -f $(java_sources:build/java/%.java=build/class/%.class)
        mkdir -p build/class
-       @./.jikes $(all_java_sources)
+       @./.jikes $(java_sources)
        touch .compile
 
 # PHASE 4: gcj-generated headers
@@ -337,4 +337,4 @@ dist-private:
 test: JVM; /System/Library/Frameworks/JavaVM.framework/Versions/1.3.1/Commands/java -jar build/JVM/xwt.jar http://localhost/demo.xwar
 #test: JVM; java -jar build/JVM/xwt.jar http://localhost/demo.xwar
 
-oldcompile: preprocess; CLASSPATH=$$CLASSPATH:lib/libgcj-minimal.jar javac -d build/class `find build/java/ -name \*.java`
+oldcompile: preprocess; CLASSPATH=$$CLASSPATH:lib/libgcj-minimal.jar javac -d build/class `find build/java/ src/org/xwt/mips -name \*.java`