-# path
-PATH := jikes-1.18/bin:$(PATH)
-
-# path
-PATH := jikes-1.18/bin:$(PATH)
-
-
-## Platform-Neutral ###########################################################################
-
-ifneq ($(verbose),true)
-.SILENT: $(cc_objects) $(java_objects) $(java_headers) all bin/org/xwt/builtin.xwar $(target_bin) compile
-silent := --silent
-endif
-
-compile: .javac .bootclasspath 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 | \
- grep -v ^\\[read | sed s_^\\[write\ bin/__ | sed s_.class\\]_.java_ | sed "s_^_compiling .java -> .class: src/_"
-
-# platforms
-all: Win32 Linux Java2
-
-.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 \
-
-jikes:
- curl ftp://www-126.ibm.com/pub/jikes/1.18/jikes-1.18.tar.bz2 | tar xjvf -
- cd jikes-1.18; ./configure --prefix=`pwd` && make && make install
- ln -sf jikes-1.18/bin/jikes .jikes
-
-bin/org/xwt/builtin.xwar: $(xwar_sources)
- mkdir -p bin/org/xwt
- cd src; $(jar) cf ../bin/org/xwt/builtin.xwar $(xwar_sources:src/%=%)
-
-clean:
- rm -rf bin-* bin
- find . -name \*~ | xargs rm -f
- find . -name \#\*\# | xargs rm -f
+include Makefile.upstream
+
+# figure out what stuff in org.xwt.plat.* this platform requires (its superclasses)
+all_java_sources := $(patsubst src/%.java, build/java/%.java, $(shell find src -name '*.java'))
+all_java_sources += $(patsubst src/%.java.pp, build/java/%.java, $(shell find src -name '*.java.pp'))
+
+java_sources := $(all_java_sources)
+nonplat_java_sources := $(filter-out build/java/org/xwt/plat/%, $(all_java_sources))
+plat_java_sources := $(filter build/java/org/xwt/plat/%, $(all_java_sources))
+
+# FIXME: must have a relitavely new GNU sed... Apple sed fails silently (why?)
+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'`/$< $@
+build/c/jpeg/%.c: upstream/jpeg-6b/src/%.c
+ @echo linking $@; mkdir -p $(@D); ln -s `echo $(@D) | sed 's_[^/]*\(/\|$$\)_../_g'`/$< $@
+
+build/java/%.java: src/%.java.pp
+ make build/class/org/xwt/util/Preprocessor.class
+ @echo -e "\n\033[1mpreprocessing .java.pp -> .java: $<\033[0m"
+ mkdir -p `dirname $@`
+ rm -f $@
+ java -cp build/class org.xwt.util.Preprocessor < $< > $@
+
+build/class/%.class: build/java/%.java .jikes
+ @echo -e "\n\033[1mcompiling .java -> .class: $<\033[0m"
+ mkdir -p build/class
+ ./.jikes $<
+
+compile: .compile
+.compile: $(all_java_sources)
+ @echo -e "\n\033[1mcompiling .java -> .class: src/**/*.java\033[0m"
+ mkdir -p build/class
+ @./.jikes $^
+ touch .compile
+
+# PHASE 4: gcj-generated headers
+java_headers := $(all_java_sources:build/java/%.java=build/h/%.h)
+build/h/%.h: build/class/%.class
+ @echo -e "\n\033[1mextracting .class -> .h: $<\033[0m"
+ mkdir -p `dirname $@`
+ ls `echo $< | sed s/.class\$$//`*.class |\
+ sed s_build/class/__ | sed s/.class\$$//g | sed s_/_._g | (cd build/class; xargs $(gcjh) -d ../h --classpath .)
+
+# a hack since we've disabled gcj's awt implementation
+build/$(platform)/org/xwt/plat/Java2.java.o:
+ touch .empty.c; mkdir -p $(@D); $(gcc) -c .empty.c -o $@;
+build/$(platform)/org/xwt/plat/AWT.java.o:
+ touch .empty.c; mkdir -p $(@D); $(gcc) -c .empty.c -o $@;
+
+build/$(platform)/%.java.o: build/java/%.java
+ @echo -e "\n\033[1mcompiling .java -> .o: $<\033[0m"
+ mkdir -p `dirname $@`
+ $(gcj) -c $< -o $@
+
+build/$(platform)/org/xwt/plat/$(platform).cc.o: src/org/xwt/plat/$(platform).cc src/org/xwt/plat/*.cc $(java_headers) .configure_jpeg-6b_$(target)
+ @echo -e "\n\033[1mcompiling .cc -> .o: $<\033[0m"
+ mkdir -p `dirname $@`
+ $(g++) -Iupstream/install/lib/gcc-lib/$(target)/3.3/include/ -Iupstream/install/$(target)/include -I/usr/X11R6/include/ -Ibuild/h -Wno-multichar -Iupstream/install/include -c $< -o $@
+
+build/$(platform)/jpeg-6b/%.c.o: upstream/jpeg-6b/src/%.c
+ @echo -e "\n\033[1mcompiling .c -> .o: $<\033[0m"
+ mkdir -p `dirname $@`
+ $(gcc) -Ibuild/h -c $< -o $@
+
+# PHASE 5: linking
+# FIXME use libjpeg
+jpeg_sources := jdapimin.c jdapistd.c jcomapi.c jcparam.c jdmaster.c jdinput.c jdmainct.c jdcoefct.c jdpostct.c jdmarker.c
+jpeg_sources += jdhuff.c jdphuff.c jddctmgr.c jidctint.c jidctfst.c jidctflt.c jidctred.c jdsample.c jdcolor.c jdmerge.c
+jpeg_sources += jquant1.c jquant2.c jerror.c jutils.c jmemnobs.c jmemmgr.c
+
+upstream/jpeg-6b/build-$(target)/libjpeg.a: .install_jpeg-6b_$(target)
+java_objects := $(java_sources:build/java/%.java=build/$(platform)/%.java.o)
+
+$(target_bin): $(java_objects) upstream/jpeg-6b/build-$(target)/libjpeg.a build/$(platform)/org/xwt/plat/$(platform).cc.o build/$(platform)/org/xwt/builtin.res.o build/$(platform)/freetype.res.o
+ @echo -e "\n\033[1mlinking .o -> $(target_bin)\033[0m"
+ mkdir -p build/$(platform)
+ upstream/install/bin/$(target)-ar rcs $(platform).ar $(plat_java_sources:build/java/%.java=build/$(platform)/%.java.o)
+ PATH=upstream/install/bin:$$PATH $(gcj) -v --main=org.xwt.Main -o build/$(platform)/$(target_bin) $^ $(jpeg_sources:%.c=upstream/jpeg-6b/build-$(target)/%.o) -Lupstream/install/$(target)/lib $(link_flags) build/$(platform)/org/xwt/plat/$(platform).java.o $(platform).ar
+
+
+##############################################################################
+# Special treatment:
+#
+
+build/xwar/builtin.xwar: $(shell ls src/org/xwt/builtin/*.*)
+ @echo -e "\n\033[1mzipping * -> .xwar: builtin.xwar\033[0m"
+ mkdir -p build/xwar
+ cd src; $(jar) cvf ../build/xwar/builtin.xwar org/xwt/builtin
+
+build/$(platform)/org/xwt/builtin.res.o: build/xwar/builtin.xwar
+ @echo -e "\n\033[1mwrapping .xwar -> .o: builtin.res.o\033[0m"
+ @(echo "unsigned int builtin_xwar_length = "; \
+ (wc -c build/xwar/builtin.xwar | sed "s_build.*__"); \
+ echo \;; \
+ echo "unsigned char builtin_xwar[] = {"; \
+ hexdump -ve '"0x" 1/1 "%x,\n"' build/xwar/builtin.xwar; \
+ echo "};") > .builtin.c
+ $(gcc) -c .builtin.c -o build/$(platform)/org/xwt/builtin.res.o
+
+build/$(platform)/freetype.res.o: build/mips/freetype.mips
+ @echo -e "\n\033[1mwrapping .mips -> .o: freetype.res.o\033[0m"
+ @(echo "unsigned int freetype_mips_length = "; \
+ (wc -c build/mips/freetype.mips | sed "s_build.*__"); \
+ echo \;; \
+ echo "unsigned char freetype_mips[] = {"; \
+ hexdump -ve '"0x" 1/1 "%x,\n"' build/mips/freetype.mips; \
+ echo "};") > .freetype.c
+ $(gcc) -c .freetype.c -o build/$(platform)/freetype.res.o
+
+
+# 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 .install_gcc-3.3_$(target) $(target_bin)
+
+build/JVM/xwt.jar: $(java_sources:build/java/%.java=build/class/%.class) build/xwar/builtin.xwar build/mips/freetype.mips
+ @echo -e "\n\033[1marchiving .class -> .jar: build/JVM/xwt.jar\033[0m"
+ mkdir -p build/JVM
+ echo -e "Manifest-Version: 1.0\nMain-Class: org.xwt.Main\n" > build/JVM/.manifest
+ cd build/class/org/xwt/; ln -fs ../../../xwar/builtin.xwar # HACK
+ cd build/class/org/xwt/; ln -fs ../../../mips/freetype.mips # HACK
+ cd build/class; $(jar) cfm ../JVM/xwt.jar ../JVM/.manifest `find .`;
+ rm build/class/org/xwt/builtin.xwar
+ rm build/class/org/xwt/freetype.mips
+
+
+
+##############################################################################
+# Freetype
+#
+
+build/mips/%.c.o: src/%.c
+ make .install_freetype-2.1.4_mips-unknown-elf target=mips-unknown-elf
+ mkdir -p $(@D)
+ echo -e "\n\033[1mcompiling $< -> $@ (mips)\033[0m"
+ upstream/install/bin/mips-unknown-elf-gcc -march=r3000 -I upstream/freetype-2.1.4/src/include -c -o $@ $<
+
+build/mips/freetype.mips: build/mips/org/xwt/imp/Freetype.c.o build/mips/org/xwt/imp/crt0.c.o build/mips/org/xwt/imp/syscalls.c.o
+ make .install_freetype-2.1.4_mips-unknown-elf target=mips-unknown-elf
+ @echo -e "\n\033[1mlinking .o -> .mips: $@\033[0m"
+ mkdir -p build/mips
+ upstream/install/bin/mips-unknown-elf-gcc \
+ -nostdlib \
+ --static \
+ -march=mips1 \
+ -T src/org/xwt/imp/linker.ld \
+ -Lbuild/mips \
+ -Lupstream/freetype-2.1.4/src/objs \
+ -o $@ \
+ build/mips/org/xwt/imp/Freetype.c.o \
+ --strip \
+ -lfreetype
+
+
+
+
+##############################################################################
+# Maintainer stuff: generating numbered builds, proposing patches
+#