2003/09/07 00:10:51

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

diff --git a/Makefile.upstream b/Makefile.upstream
index 46f6c5d..26f505a 100644 (file)
--- a/Makefile.upstream
+++ b/Makefile.upstream
@@ -32,6 +32,7 @@ configure_gcc-3.3-mips                  := --enable-languages=c --nfp --with-new
 # vendor-supplied binaries and headers; this is stuff that comes with various OSes
 vendor: .vendor
 .vendor:
+       @echo -e "\n\033[1mdownloading vendor-supplied headers and libraries...\033[0m"
        curl http://www.megacz.com/vendor.tgz | tar xzf - -C upstream/install
        curl $(url_w32api-2.3) | tar xzf - -C upstream/install/i686-pc-mingw32
        curl $(url_mingw-runtime-3.0) | tar xzf - -C upstream/install/i686-pc-mingw32
@@ -39,7 +40,7 @@ vendor: .vendor
 
 download_%: .download_%
 .download_%:
-       echo -e "\ndownloading %..."
+       @echo -e "\n\033[1mdownloading $*...\033[0m"
        mkdir -p upstream/$*
        curl $(url_$*) | tar xzf - -C upstream/$*
        mv upstream/$*/$* upstream/$*/src; true
@@ -48,7 +49,7 @@ download_%: .download_%
 
 configure_%: .configure_%
 .configure_%: download_% 
-       echo -e "\nconfiguring %..."
+       @echo -e "\n\033[1mconfiguring $*...\033[0m"
        mkdir -p $*/build-$(target)
        cd -p $*/build-$(target); \
                $(setcc) ../src/configure \
@@ -60,23 +61,25 @@ configure_%: .configure_%
 
 install_%: .install_%
 .install_%: configure_%
-       echo -e "\nbuilding $*..."
+       @echo -e "\n\033[1mbuilding $*...\033[0m"
        cd upstream/$*/build-$(target); $(setcc) PATH=$$PATH:`pwd`/../../install/bin make
-       echo -e "\ninstalling $*..."
+       @echo -e "\n\033[1minstalling $*...\033[0m"
        cd upstream/$*/build-$(target); $(setcc) PATH=$$PATH:`pwd`/../../install/bin make install
        touch $@
 
 .install_freetype-2.1.4: download_freetype-2.1.4 install_binutils-2.13.2.1 install_gcc-3.3
+       @echo -e "\n\033[1mbuilding freetype $*...\033[0m"
        cd upstream/freetype-2.1.4/src; make setup ansi; PATH=$$PATH:`pwd`/../install/bin make CC=mips-gcc AR=mips-ar
        ../install/bin/mips-ranlib freetype-2.1.4/objs/libfreetype.a
        touch $@
 
 # jikes has a special target to autodetect a pre-installed jikes, and to autodetect the JVM's $CLASSPATH
 .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=$$PATH:upstream/install/bin/ jikes -classpath lib/libgcj-minimal.jar $$@ -d build/class/ -sourcepath build/java/ ' >> .jikes
-       (type jikes && (jikes --version | grep "Version 1.18")) || make jikes-1.18/src jikes-1.18/.installed
+       (type jikes && (jikes --version | grep "Version 1.18")) || make install_jikes-1.18
        echo -n "$(jikes_flags) -bootclasspath " >> .jikes
        echo "public class GetBootClassPath { public static void main(String[] s) { " > GetBootClassPath.java
        echo "System.out.println(System.getProperty(\"sun.boot.class.path\")); } }"  >> GetBootClassPath.java