2004/01/19 00:16:53

[org.ibex.core.git] / Makefile.upstream

diff --git a/Makefile.upstream b/Makefile.upstream
index 841493f..d9f4d12 100644 (file)
--- a/Makefile.upstream
+++ b/Makefile.upstream
@@ -152,18 +152,14 @@ endif
        cd upstream/libmspack-20030726/build-$(target); ln -sf ../src/mspack/* .
        touch $@
 
+.install_binutils-2.13.2.1_mips-unknown-elf: .install_mips2java; touch $@
+.install_gcc-3.3_mips-unknown-elf:           .install_mips2java; touch $@
 .install_mips2java:
        mkdir -p upstream/install
        echo '/1 :pserver:cvs@cvs.xwt.org:2401/ A' >> ~/.cvspass
        cd upstream; cvs -d :pserver:cvs@cvs.xwt.org:/ co mips
-       cd upstream/mips/upstream; ln -s `cd ../..; pwd`/install
-       make -C upstream/mips
-       touch $@
-
-.install_binutils-2.13.2.1_mips-unknown-elf: .install_mips2java
-       touch $@
-
-.install_gcc-3.3_mips-unknown-elf: .install_mips2java
+       cd upstream/mips/upstream; ln -sf `cd ../..; pwd`/install
+       (cd upstream/mips; make)
        touch $@
 
 .install_freetype-2.1.4_mips-unknown-elf: .install_mips2java .download_freetype-2.1.4
@@ -198,8 +194,7 @@ endif
 .jikes:
        @echo -e "\n\033[1mdetecting your jikes installation...\033[0m"
        echo "#!/bin/sh" > .jikes
-       #echo 'for A in `find build/class -name \*.class`; do mv $$A $$A.old; done;' >> .jikes
-       echo -n 'PATH=upstream/install/bin:$$PATH jikes -classpath lib/libgcj-minimal.jar:build/class $$@ -d build/class/ -sourcepath build/java/ ' >> .jikes
+       echo -n 'PATH=upstream/install/bin:$$PATH jikes -classpath lib/libgcj-minimal.jar:build/class:upstream/mips/build $$@ -d build/class/ -sourcepath build/java/ ' >> .jikes
        (type jikes && (jikes --version | grep "Version 1.18")) || make .install_jikes-1.18_ target=
        echo -n "$(jikes_flags) -bootclasspath " >> .jikes
        echo "public class GetBootClassPath { public static void main(String[] s) { " > GetBootClassPath.java
@@ -208,8 +203,6 @@ endif
        java -cp . GetBootClassPath >> .jikes
        rm GetBootClassPath.*
        echo 'EXIT=$$?' >> .jikes
-       #echo 'for A in `find build/class -name \*.class`; do test -e $$A.old && cmp -s $$A $$A.old && mv $$A.old $$A; done' >> .jikes
-       #echo 'for A in `find build/class -name \*.class`; do test -e $$A.old && rm $$A.old; done' >> .jikes
        echo 'exit $$EXIT' >> .jikes
        mv .jikes .jikes+
        cp .jikes+ .jikes