2003/11/13 09:15:12

[org.ibex.core.git] / Makefile

diff --git a/Makefile b/Makefile
index 4392101..a461981 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -69,6 +69,7 @@ build/class/org/xwt/util/Preprocessor.class: src/org/xwt/util/Preprocessor.java
        ./.jikes $<
 
 # this forces a clean build every time because jikes is so damn buggy
+preprocess: $(all_java_sources)
 compile: .compile
 .compile: $(all_java_sources) .jikes
        @echo -e "\n\033[1mcompiling          .java -> .class: src/**/*.java\033[0m"
@@ -177,7 +178,7 @@ build/mips/%.c.o: src/%.c
        echo -e "\n\033[1mcompiling $< -> $@ (mips)\033[0m"
        upstream/install/bin/mips-unknown-elf-gcc -march=r3000 \
                -Iupstream/freetype-2.1.4/src/include  \
-               -Iupstream/libmspack-20030726/libmspack/mspack/ \
+               -Iupstream/libmspack-20030726/src/mspack \
                -c -o $@ $<
 
 build/res/freetype.mips: build/mips/org/xwt/translators/Freetype.c.o build/mips/org/xwt/mips/crt0.c.o build/mips/org/xwt/mips/syscalls.c.o
@@ -206,7 +207,8 @@ build/res/libmspack.mips: .install_libmspack-20030726 build/mips/org/xwt/transla
                -march=mips1 \
                -T src/org/xwt/mips/linker.ld \
                -Lbuild/mips \
-               -Lupstream/libmspack-20030726/build-mips-unknown-elf/ \
+               -Lupstream/libmspack-20030726/src/mspack \
+               -Lupstream/libmspack-20030726/build-mips-unknown-elf \
                -o $@ \
                build/mips/org/xwt/translators/MSPack.c.o \
                --strip \
@@ -320,4 +322,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: ; 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/ -name \*.java`