2003/08/09 23:43:23

[org.ibex.core.git] / Makefile

diff --git a/Makefile b/Makefile
index 2c03a43..593bb6d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -62,7 +62,10 @@ ifneq ($(verbose),true)
 silent := --silent
 endif
 
-compile: .javac .bootclasspath bin/org/xwt/builtin.xwar
+
+# preprocessing: use m4 -P
+
+compile: .javac bin/org/xwt/builtin.xwar
        echo "compiling   .java -> .class:"
        mkdir -p bin
        $(shell cat .javac) -classpath lib/libgcj-minimal.jar $(java_sources) -d bin/ 2>&1 | \
@@ -73,19 +76,19 @@ all: Win32 Linux Java2 #Solaris
 
 .javac:
        @if \
-       @       type jikes && (jikes --version | grep "Version 1.18"); \
-       @then \
-       @       echo "public class GetBootClassPath { public static void main(String[] s) { " > GetBootClassPath.java; \
-       @       echo "System.out.println(System.getProperty(\"sun.boot.class.path\")); } }" >> GetBootClassPath.java; \
-       @       javac GetBootClassPath.java; \
-       @       java -cp . GetBootClassPath > .bootclasspath; \
-       @       rm GetBootClassPath.*; \
-       @       echo -n "jikes -nowarn -sourcepath src/ -bootclasspath " > .javac; \
-       @       cat .bootclasspath >> .javac; \
-       @else \
-       @       echo "WARNING: You do not have jikes; falling back to javac.  Compiles will be very slow."; \
-       @       echo javac > .javac; \
-       @fi
+               type jikes && (jikes --version | grep "Version 1.18"); \
+       then \
+               echo "public class GetBootClassPath { public static void main(String[] s) { " > GetBootClassPath.java; \
+               echo "System.out.println(System.getProperty(\"sun.boot.class.path\")); } }" >> GetBootClassPath.java; \
+               javac GetBootClassPath.java; \
+               java -cp . GetBootClassPath > .bootclasspath; \
+               rm GetBootClassPath.*; \
+               echo -n "jikes -nowarn -sourcepath src/ -bootclasspath " > .javac; \
+               cat .bootclasspath >> .javac; \
+       else \
+               echo "WARNING: You do not have jikes; falling back to javac.  Compiles will be very slow."; \
+               echo javac > .javac; \
+       fi
 
 jikes:
        curl ftp://www-126.ibm.com/pub/jikes/1.18/jikes-1.18.tar.bz2 | tar xjvf -
@@ -151,14 +154,16 @@ gcc/src/.freetype:
 
 freetype.mips: gcc/src/.freetype
        make -C gcc mips target=mips
-       $(gcc_path)/bin/mips-gcc -v \
+       $(gcc_path)/bin/mips-gcc \
                --static \
+               -march=r3000 \
                -o freetype.mips \
                -I gcc/src/freetype-2.1.4/include \
                $(freetype_sources) \
+               -Wl,--warn-once \
                src/org/xwt/imp/Freetype.c \
-               $(gcc_path)/mips/lib/libc.a $(gcc_path)/mips/lib/libnosys.a \
-               -Wl,-T,$(gcc_path)/mips/lib/cfe.ld
+               $(gcc_path)/mips/lib/libc.a \
+               -Wl,-T,$(gcc_path)/mips/lib/nullmon.ld
 
 # compile is here to force compilation of the .class files (they get used via -Ibin/) without
 # having the individual .o's depend on the .java's (otherwise every .o gets recompiled when one .java changes)