2004/01/16 09:36:05

[org.ibex.core.git] / Makefile

diff --git a/Makefile b/Makefile
index 575cbb1..ca9a769 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -185,7 +185,7 @@ build/$(platform)/builtin.o: build/res/builtin.jar
 
 # compile is here to force compilation of the .class files (they get used via -Ibuild) without
 # having the individual .o's depend on the .java's (otherwise every .o gets recompiled when one .java changes)
-gcj: .vendor .compile .install_gcc-3.3.2_$(target) $(target_bin)
+gcj: .vendor .compile .install_gcc-3.3_$(target) $(target_bin)
 
 build/JVM/xwt.jar: .compile build/res/builtin.jar
        @echo -e "\n\033[1marchiving         .class -> .jar:   build/JVM/xwt.jar\033[0m"
@@ -212,7 +212,7 @@ build/mips/%.c.o: src/%.c .download_libmspack-20030726
                -Iupstream/libmspack-20030726/src/mspack \
                -c -o $@ $<
 
-build/mips/mipsapps.mips: build/mips/org/xwt/translators/Freetype.c.o build/mips/org/xwt/translators/MSPack.c.o build/mips/org/xwt/translators/main.c.o build/mips/org/xwt/mips/crt0.c.o build/mips/org/xwt/mips/syscalls.c.o
+build/mips/mipsapps.mips: build/mips/org/xwt/translators/Freetype.c.o build/mips/org/xwt/translators/MSPack.c.o build/mips/org/xwt/translators/main.c.o
        make .install_freetype-2.1.4_mips-unknown-elf target=mips-unknown-elf
        make .install_libmspack-20030726_mips-unknown-elf target=mips-unknown-elf
        @echo -e "\n\033[1mlinking               .o -> .mips:  $@\033[0m"
@@ -221,10 +221,11 @@ build/mips/mipsapps.mips: build/mips/org/xwt/translators/Freetype.c.o build/mips
                -nostdlib \
                --static \
                -march=mips1 \
-               -T src/org/xwt/mips/linker.ld \
-               -Lbuild/mips \
-               -Lupstream/freetype-2.1.4/src/objs \
-               -Lupstream//libmspack-20030726/build-mips-unknown-elf/ \
+               -T upstream/mips/org/xwt/mips/linker.ld \
+               -L upstream/mips/build/org/xwt/mips/ \
+               -L upstream/mips/build/ \
+               -L upstream/freetype-2.1.4/src/objs \
+               -L upstream/libmspack-20030726/build-mips-unknown-elf/ \
                -o $@ \
                $^ \
                -lfreetype \