2003/09/07 00:00:43

darcs-hash:20040130070450-2ba56-85bc787f38975730f41b5f8a13ed66342463ed9d.gz

diff --git a/Makefile b/Makefile
index 3bbbef4..bdc2c4e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -50,9 +50,7 @@ jpeg_c_sources    += jquant1.c jquant2.c jerror.c jutils.c jmemnobs.c jmemmgr.c
 upstream/jpeg-6b/src/%.c: download_jpeg-6b
 
 freetype_sources    := ftsystem.c ftmm.c ftbbox.c ftinit.c ftdebug.c ftbase.c ftglyph.c smooth.c sfnt.c truetype.c
-upstream/freetype-2.1.4/%.c: ; make -sC upstream freetype-2.1.4/src
-
-$(gcc_path)/bin/$(target)-gcj:  ; make -sC upstream gcc-3.3-$(target)
+upstream/freetype-2.1.4/%.c: download_freetype-2.1.4
 
 # PHASE 1b: human-written inputs
 java_sources      := $(patsubst src/%.java,    build/java/%.java, $(shell find src -name \*.java))
@@ -60,7 +58,6 @@ java_sources      += $(patsubst src/%.java.pp, build/java/%.java, $(shell find s
 java_sources      += $(patsubst src/%.mips.c,  build/java/%.java, $(shell find src -name \*.mips.c))
 java_sources      += build/java/org/xwt/Builtin.java
 
-
 # PHASE 2: ready-to-compile java files (either symlinked to phase 1a sources or else generated from them)
 build/java/%.java: src/%.java ; @echo linking $@; mkdir -p $(@D); ln -s `echo $(@D) | sed 's_[^/]*\(/\|$$\)_../_g'`/$< $@
 build/cc/%.cc:     src/%.c    ; @echo linking $@; mkdir -p $(@D); ln -s `echo $(@D) | sed 's_[^/]*\(/\|$$\)_../_g'`/$< $@
@@ -78,15 +75,16 @@ build/java/%.java: src/%.java.pp build/class/org/xwt/util/Preprocessor.class
        @java -cp build/class org.xwt.util.Preprocessor < $< > $@
 
 # PHASE 3: class files
-upstream/.jikes:                ; make -sC upstream .jikes
-build/class/%.class: build/java/%.java upstream/.jikes build/class/.
+build/class/%.class: build/java/%.java .jikes
        @echo "compiling          .java -> .class: $<"
-       @upstream/.jikes $<
+       @mkdir -p build/class
+       @./.jikes $<
 
 compile: .compile
-.compile: $(java_sources) build/class/.
+.compile: $(java_sources)
        @echo "compiling          .java -> .class: src/**/*.java"
-       @upstream/.jikes $(java_sources)
+       @mkdir -p build/class
+       @./.jikes $(java_sources)
        @touch .compile
 
 # PHASE 4: gcj-generated headers
@@ -146,9 +144,6 @@ build/java/org/xwt/imp/Freetype.java:: build/mips/freetype.mips build/class/org/
        @rm -f $@
        @java -cp build/class org.xwt.imp.MIPS org.xwt.imp.Freetype build/mips/freetype.mips > build/java/org/xwt/imp/Freetype.java
 
-$(gcc_path)/bin/mips-gcc:
-       @make -sC upstream gcc-3.3-mips target=mips
-
 build/mips/%.o: src/org/xwt/imp/%.c $(gcc_path)/bin/mips-gcc upstream/.freetype
        @mkdir -p build/mips
        @echo "compiling $< -> $@ (mips)"

diff --git a/Makefile.upstream b/Makefile.upstream
index 46f6c5d..cab5198 100644 (file)
--- a/Makefile.upstream
+++ b/Makefile.upstream
@@ -76,7 +76,7 @@ install_%: .install_%
        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