better
[org.ibex.core.git] / Makefile
index 16e15b7..5fb91ff 100644 (file)
--- a/Makefile
+++ b/Makefile
-#           
-# The XWT Makefile
+#############################################################################
+#
+# The Ibex Makefile
 #
 
-## Configurables ###########################################################################
-
-# inputs
-jikes_java_sources     := $(shell find src -name *.java)
-gcj_java_sources       := $(shell find src -name *.java -not -path src/org/xwt/plat/\*) src/org/xwt/plat/GCJ.java $(platform_java_sources)
-xwar_sources           := $(ls src/org/xwt/builtin/*.png src/org/xwt/builtin/*.xwt src/org/xwt/builtin/*.xwf)
-cc_sources             := src/org/xwt/plat/$(platform).cc
-
-# outputs
-jikes_java_objects     := $(jikes_java_sources:src/%.java=bin/%.class)
-cc_objects             := $(cc_sources:src/%.cc=bin-$(platform)/%-nat.o)
-gcj_java_objects       := $(gcj_java_sources:src/%.java=bin-$(platform)/%.o)
-
-# tools
-gcc_path               := $(shell pwd)/gcc
-gcc_flags              := -O9 -ffast-math -fomit-frame-pointer -foptimize-sibling-calls -finline-functions -funroll-loops -g
-gcj_flags              := -fCLASSPATH=bin 
-gcj                    := $(gcc_path)/bin/$(target)-gcj $(gcj_flags) $(gcc_flags)
-gcc                    := $(gcc_path)/bin/$(target)-g++ $(gcc_flags)
-gcjh                   := $(gcc_path)/bin/$(target)-gcjh
-ar                     := $(gcc_path)/$(target)/bin/ar
-strip                  := $(gcc_path)/$(target)/bin/strip
-jikes                  := jikes -extdirs ${JAVA_HOME}/jre/lib -nowarn
-
-# platforms
-all_platforms          := Win32 Linux Java2
-
-
-## Platform-Neutral ###########################################################################
-
-ifneq ($(verbose),true)
-.SILENT: $(jikes_java_objects) .headers $(gcj_java_objects) $(all_platforms) bin/org/xwt/builtin.xwar
-silent := --silent
-endif
-
-compile: $(jikes_java_objects) bin/org/xwt/builtin.xwar
-
-all: $(all_platforms)
-
-$(jikes_java_objects): $(jikes_java_sources)
-       test "$(JAVA_HOME)"x != x || (echo "you forgot to set your $$JAVA_HOME environment variable"; false)
-       echo "compiling  .java -> .class:"
-       mkdir -p bin
-       $(jikes) -sourcepath src/ -classpath lib/libgcj-minimal.jar $(jikes_java_sources) -d bin/
-       echo "compiling  .java -> .class: done"
-
-bin/org/xwt/builtin.xwar: $(xwar_sources)
-       mkdir -p bin/org/xwt
-       cd src; fastjar cf ../bin/org/xwt/builtin.xwar $(xwar_sources:src/%=%)
-
-clean:
-       rm -rf bin-* bin
-       find . -name \*~ | xargs rm -f
-       find . -name \#\*\# | xargs rm -f
-
-update-build:
-       (echo -n 0000; (echo "10k16o16i"; cat next.build | tr a-z A-Z; echo "1+f") | dc) | tail --bytes=5 > next.build-
-       mv next.build- next.build
-       echo -n "Next build will be "
-       cat next.build
-       cvs update CHANGES
-       echo "" >> CHANGES
-       echo `date +%d-%b`" =========== build $(current_build) ================================================" >> CHANGES
-       echo committing...
-       cvs commit -m 'this comment should not appear in CHANGES' next.build CHANGES
-       echo committed.
-
-
-## GCJ-Derived Platforms #######################################################################
-
-# if the user doesn't change gcc_path, and it's not built, then we'll try to build it
-$(shell pwd)/gcc/bin/$(target)-gcj:
-       cd gcc; make
-
-gcj: compile $(gcc_path)/bin/$(target)-gcj .headers link
-
-link: $(gcj_java_objects) $(cc_objects) bin-$(platform)/org/xwt/builtin.o
-       echo "linking       .o -> $(target_bin)"
-       $(ar) r bin-$(platform)/org/xwt/plat/platform.ar bin-$(platform)/org/xwt/plat/*.o
-       $(gcj) --main=org.xwt.Main -o bin-$(platform)/$(target_bin) $^ $(platform_link) bin-$(platform)/org/xwt/plat/platform.ar
-
-.headers: $(jikes_java_objects)
-       cd bin; for A in `find * -name \*.class`; do \
-               echo "extracting .class -> .h:     $$A"; \
-               $(gcjh) --classpath . `echo $$A | sed s_/_._g | sed s/.class$$//`; \
-               done
-       echo "extracting .class -> .h:     done"
-       touch .headers
-
-# turn off optimization of Trap.java due to a compiler bug
-bin-$(platform)/org/xwt/Trap.o: gcj_flags := -O0 -g
-
-$(gcj_java_objects): bin-$(platform)/%.o: src/%.java $(jikes_java_objects)
-       echo -ne "compiling  .java -> .o:     $<"
+#  auto directory creation with %/%: %?
+
+target_Darwin := powerpc-apple-darwin
+target_Win32  := i686-pc-mingw32
+target_Solaris := sparc-sun-solaris2.7
+target_Linux := i686-pc-linux-gnu
+target := $(target_$(platform))
+
+all:         JVM Linux Win32 Darwin Solaris
+
+clean:      ; rm -rf build
+dist-clean:
+       rm -rf .jikes .configure* .install* build .compile .build*
+       find upstream -name config.cache -exec rm {} \;
+       test -e upstream/mips && make -C upstream/mips clean
+
+#libwing_Linux := -Lupstream/install/i686-pc-linux-gnu/lib/
+#libwing_Linux +=   upstream/install/i686-pc-linux-gnu/lib/libWINGs.a
+#libwing_Linux +=   upstream/install/i686-pc-linux-gnu/lib/libwraster.a
+
+libwing_Solaris := -Lupstream/install/sparc-sun-solaris2.7/lib/
+libwing_Solaris +=   upstream/install/sparc-sun-solaris2.7/lib/libWINGs.a
+libwing_Solaris +=   upstream/install/sparc-sun-solaris2.7/lib/libwraster.a
+
+JVM:        build/JVM/ibex.jar
+Linux:    ; make gcj platform=Linux   link_flags="$(libwing_Linux) -lXpm -lX11 -lXext"
+Solaris:  ; make gcj platform=Solaris link_flags="$(libwing_Solaris) -lXpm -lX11 -lXext -lpthread"
+Win32:    ; make gcj platform=Win32   link_flags="-Wl,--subsystem,windows -lcomdlg32"
+Darwin:   ; make gcj platform=Darwin  link_flags="$(darwin_linker_flags)"
+
+darwin_libdir       := upstream/install/powerpc-apple-darwin/lib
+darwin_linker_flags := -Wl,-dylib_file,/usr/lib/libSystem.B.dylib:$(darwin_libdir)/libSystem.B.dylib
+darwin_linker_flags += -Wl,-dylib_file,/usr/lib/system/libmathCommon.A.dylib:$(darwin_libdir)/libmathCommon.A.dylib
+darwin_ogl_libdir   := /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries
+darwin_linker_flags += -Wl,-dylib_file,$(darwin_ogl_libdir)/libGL.dylib:$(darwin_libdir)/libGL.dylib
+darwin_linker_flags += -Wl,-dylib_file,$(darwin_ogl_libdir):$(darwin_libdir)/libGLU.dylib
+darwin_linker_flags += -lSystem.B -lmathCommon.A -lGL -lGLU
+
+# stupid broke-ass darwin linker...
+darwin_linker_flags += build/Darwin/org/ibex/plat/OpenGL.java.o build/Darwin/org/ibex/plat/POSIX.java.o
+
+target_bin_extension_$(platform) := $(shell echo $(platform) | tr A-Z a-z)
+target_bin_extension_Win32       := exe
+target_bin_extension_JVM         := jar
+target_bin_extension             := $(target_bin_extension_$(platform))
+target_bin                       := ibex.$(target_bin_extension)
+
+jikes_flags        := -nowarn
+gcc_optimizations  := -O2
+#gcc_optimizations  := -O9 -ffast-math -fomit-frame-pointer -foptimize-sibling-calls
+#gcc_optimizations  += -finline-functions -funroll-loops -ffunction-sections -fdata-sections
+
+gcc_flags          := -nostdinc $(gcc_optimizations) -Ibuild/h -Iupstream/jpeg-6b/src -Iupstream/jpeg-6b/build-$(target)
+gcc_flags          += -Iupstream/install/lib/gcc-lib/$(target)/3.3/include -Iupstream/install/$(target)/include
+gcj                := upstream/install/bin/$(target)-gcj $(gcc_flags) -fCLASSPATH=build/java
+gcjh               := $(shell pwd)/upstream/install/bin/$(shell test -e upstream/install/bin/$(target)-gcjh && echo $(target)-)gcjh
+g++                := upstream/install/bin/$(target)-gcj $(gcc_flags) -Iupstream/install/include -Wno-multichar
+gcc                := upstream/install/bin/$(target)-gcc $(gcc_flags)
+jar                := $(shell ((type fastjar &>/dev/null) && echo fastjar) || echo jar)
+
+gcj: .install_gcc-3.3_$(target)
+#      make compile
+       make build/$(platform)/$(target_bin) link_flags="$(link_flags)" platform=$(platform)
+
+include Makefile.upstream
+
+java_sources              := $(patsubst src/%.java,     build/java/%.java, $(shell find src -name '*.java' | grep -v Preprocessor | grep -v plat/AWT | grep -v plat/Java2))
+java_sources              += build/java/org/xwt/mips/Errno.java
+java_sources              += build/java/org/xwt/mips/Unistd.java
+java_sources              += build/java/org/xwt/mips/Syscalls.java
+java_sources              += build/java/org/xwt/mips/Registers.java
+java_sources              += build/java/org/xwt/mips/Runtime.java
+java_sources              += build/java/org/xwt/mips/UnixRuntime.java
+java_sources              += build/java/org/xwt/mips/util/SeekableByteArray.java
+java_sources              += build/java/org/xwt/mips/util/SeekableData.java
+java_sources              += build/java/org/xwt/mips/util/SeekableFile.java
+java_sources              += build/java/org/xwt/mips/util/SeekableInputStream.java
+
+build/java/org/xwt/mips/util/%:
+       @test -e .install_mips2java || make .install_mips2java
+       @echo linking $@
+       @mkdir -p $(@D)
+       @cd $(@D); ln -sf ../../../../../../upstream/mips/org/xwt/mips/util/$*
+
+build/java/org/xwt/mips/%:
+       @test -e .install_mips2java || make .install_mips2java
+       @echo linking $@
+       @mkdir -p $(@D)
+       @test -e upstream/mips/build/org/xwt/mips/$* && (cd $(@D); \
+               ln -sf ../../../../../upstream/mips/build/org/xwt/mips/$*); true
+       @test -e upstream/mips/org/xwt/mips/$* && (cd $(@D); \
+               ln -sf ../../../../../upstream/mips/org/xwt/mips/$*); true
+
+
+### Java Class Files ##############################################################################
+
+build/class/org/ibex/translators/MIPSApps.class: build/mips/mipsapps.mips .jikes
+       mkdir -p build/java/org/ibex/translators
+       @echo -e "\n\033[1mtranslating        .mips -> .java:  $<\033[0m"
+       (echo -e 'package org.ibex.translators;\n';                           \
+        java -Xint -cp upstream/mips/build org.xwt.mips.Compiler MIPSApps build/mips/mipsapps.mips) \
+        | sed 's,//.*$$,,;'| tr -d '\n' > build/java/org/ibex/translators/MIPSApps.java
+       @echo -e "\n\033[1mcompiling          .java -> .class: $<\033[0m"
+       ./.jikes -g:none build/java/org/ibex/translators/MIPSApps.java
+
+build/java/org/ibex/%.java: src/org/ibex/%.java
+       make build/class/org/ibex/util/Preprocessor.class
+       @echo -e "\n\033[1mpreprocessing      .java -> .java:  $<\033[0m"
+       mkdir -p `dirname $@`; java -cp build/class org.ibex.util.Preprocessor < $< > $@
+
+build/java/%.java: src/%.java ; @echo linking $@; mkdir -p $(@D); ln -fs `echo $(@D)/ | sed 's_[^/]*//*_../_g'`/$< $@
+build/cc/%.cc:     src/%.c    ; @echo linking $@; mkdir -p $(@D); ln -fs `echo $(@D)/ | sed 's_[^/]*//*_../_g'`/$< $@
+build/res/%:       src/%      ; @echo linking $@; mkdir -p $(@D); ln -fs `echo $(@D)/ | sed 's_[^/]*//*_../_g'`/$< $@
+
+gnu_regexp_jfiles  := $(patsubst src/%.java, build/java/%.java, $(shell find src/gnu/regexp -name \*.java))
+gnu_regexp  := $(patsubst src/%.java, build/class/%.class, $(shell find src/gnu/regexp -name \*.java))
+
+build/class/gnu/regexp/%.class: build/java/gnu/regexp/%.java $(gnu_regexp_jfiles) .jikes
+       @echo -e "\n\033[1mcompiling          .java -> .class: $<\033[0m"
+       mkdir -p build/class/org/ibex/util/
+       ./.jikes $<
+
+build/class/org/ibex/util/Preprocessor.class: src/org/ibex/util/Preprocessor.java $(gnu_regexp) .jikes
+       @echo -e "\n\033[1mcompiling          .java -> .class: $<\033[0m"
+       mkdir -p build/class/org/ibex/util/
+       ./.jikes src/org/ibex/util/Vec.java
+       ./.jikes $<
+
+build/class/%.class: build/java/%.java $(java_sources) .jikes
+       @echo -e "\n\033[1mcompiling          .java -> .class: $<\033[0m"
+       mkdir -p $(@D)
+       ./.jikes $<
+
+oldcompile:; CLASSPATH=$$CLASSPATH:lib/libgcj-minimal.jar:upstream/mips/build javac -target 1.1 -source 1.2 -d build/class `find build/java/ -name \*.java`
+
+compile: .jikes .install_mips2java
+       @make -s $(java_sources:build/java/%.java=build/class/%.class)
+.compile: compile
+
+.compile: $(java_sources) .jikes .install_mips2java
+       @echo -e "\n\033[1mcompiling          .java -> .class: src/**/*.java\033[0m"
+       @rm -f $(java_sources:build/java/%.java=build/class/%.class)
+       mkdir -p build/class
+       cd build/java; for A in `find . -name \*.java`; do mkdir -p ../class/`dirname $$A`; done
+       @./.jikes $(java_sources)
+       touch .compile
+
+build/JVM/ibex.jar: .compile build/res/builtin.jar build/class/org/ibex/translators/MIPSApps.class
+       @echo -e "\n\033[1marchiving         .class -> .jar:   build/JVM/ibex.jar\033[0m"
+       mkdir -p build/JVM
+       echo -e "Manifest-Version: 1.0\nMain-Class: org.ibex.Main\n" > build/JVM/.manifest
+       cd build/class/org/ibex; ln -sf ../../../res/builtin.jar
+       cd build/class; $(jar) cfm ../JVM/ibex.jar ../JVM/.manifest \
+               `find . \! -type d` \
+               $(patsubst %,../../upstream/mips/build/org/xwt/mips/%*.class, Runtime Registers Syscalls Errno)
+
+
+### GCJH Headers ##############################################################################
+
+java_headers          := $(java_sources:build/java/%.java=build/h/%.h) 
+build/h/edu/stanford/ejalbert/BrowserLauncher.h:; mkdir -p $(@D); touch $@
+build/h/%.h: build/class/%.class .compile
+       @echo -e "\n\033[1mextracting        .class -> .h:     $<\033[0m"
        mkdir -p `dirname $@`
-       $(gcj) -c $< -o $@
-
-$(cc_objects): bin-$(platform)/%-nat.o: src/%.cc
-       echo -ne "compiling  .cc -> .o:     $$A"
-       $(gcc) -Ibin -c $< -o $@
-
-bin-$(platform)/org/xwt/builtin.o: bin/org/xwt/builtin.xwar
-       echo "wrapping   .xwar -> .o"
-       $(gcj) --resource org/xwt/builtin.xwar -c $< -o $@
-
-
+       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 .)
 
-## Platforms ##############################################################################
 
-Linux:
-       echo -e "\\n=== Linux ========================================="
-       make gcj \
-               platform=Linux \
-               target=i686-pc-linux-gnu \
-               target_bin=xwt.linux \
-               platform_link="-L$(gcc-path)/lib -L/usr/X11R6/lib -lX11 -lXext --static" \
-               platform_java_sources="src/org/xwt/plat/POSIX.java src/org/xwt/plat/X11.java"
+### Native Code ##############################################################################
 
-Win32:
-       echo -e "\\n=== Win32 ========================================="
-       make gcj \
-               platform=Win32 \
-               target=i686-pc-mingw32 \
-               target_bin=xwt.exe \
-               platform_link="-Wl,--subsystem,windows -lcomdlg32" \
-               platform_java_sources=src/org/xwt/plat/Win32.java
+# a hack since we've disabled gcj's awt implementation
+build/$(platform)/org/ibex/plat/Java2.java.o: ; touch .empty.c; mkdir -p $(@D); $(gcc) -c .empty.c -o $@;
+build/$(platform)/org/ibex/plat/AWT.java.o:   ; touch .empty.c; mkdir -p $(@D); $(gcc) -c .empty.c -o $@;
 
-Java2: $(jikes_java_objects) bin/org/xwt/builtin.xwar
-       echo -e "\\n=== Java2 ========================================="
-       echo "archiving .class -> .jar"
-       mkdir -p bin-Java2
-       echo -e "Manifest-Version: 1.0\nMain-Class: org.xwt.Main\n" > bin/.manifest
-       cd bin; fastjar cvf ../bin-Java2/xwt.jar -m .manifest \
-                org/xwt/builtin.xwar \
-               `find . -name \*.class | grep -v org/xwt/plat/` \
-               org/xwt/plat/AWT*.class org/xwt/plat/Java2*.class | tr \\012 \\015
-       echo
-
-$(java2_objects:bin/%=%)
+build/$(platform)/%.java.o: build/class/%.class
+       @echo -e "\n\033[1mcompiling          .java -> .o:     $<\033[0m"
+       mkdir -p `dirname $@`
+       $(gcj) -fCLASSPATH=build/pruned -c $< -o $@
 
-PalmOS:
-       echo "PalmOS is not yet supported"
-       false
+# FIXME detect subclasses of X11
+build/$(platform)/org/ibex/plat/Linux.cc.o: .install_WindowMaker-0.80.2_$(target) 
+build/$(platform)/org/ibex/plat/Solaris.cc.o: .install_WindowMaker-0.80.2_$(target) 
 
+build/$(platform)/org/ibex/plat/$(platform).cc.o: src/org/ibex/plat/$(platform).cc src/org/ibex/plat/*.cc .configure_jpeg-6b_$(target)
+       @make $(java_headers)
+       @echo -e "\n\033[1mcompiling            .cc -> .o:     $<\033[0m"
+       mkdir -p `dirname $@`
+       $(g++) -c $< -o $@
+
+nonplat_java_sources := $(filter-out build/java/org/ibex/plat/$(platform).java,$(java_sources))
+build/$(platform)/$(platform).ar: $(nonplat_java_sources:build/java/%.java=build/$(platform)/%.java.o)
+       @echo -e "\n\033[1marchiving             .o -> .a\033[0m"
+       mkdir -p build/$(platform)
+       rm -f $@
+       upstream/install/$(target)/bin/ar rc $@ $^
+       upstream/install/$(target)/bin/ranlib $@
+
+upstream/jpeg-6b/build-$(target)/libjpeg.a: .install_jpeg-6b_$(target)
+
+# note: binaries appear in a different order in the dependency line vs the link line
+build/$(platform)/$(target_bin): upstream/jpeg-6b/build-$(target)/libjpeg.a 
+       @echo -e "\n\033[1mlinking               .o -> $(target_bin)\033[0m"
+
+       rm -rf build/$(platform)/*
+       make build/$(platform)/org/ibex/plat/$(platform).cc.o
+       make build/$(platform)/builtin.o
+
+       cd upstream/gcc-3.3/build-$(target)/$(target)/libjava;           \
+                       (find . -name nat\*.o | grep -v JIS;              \
+                       echo boehm.o;\
+                       echo defineclass.o;\
+                       echo exception.o;\
+                       echo posix-threads.o;\
+                       echo posix.o;\
+                       echo prims.o;\
+                       echo jni.o;\
+                       echo resolve.o;\
+                       echo libltdl/ltdl.o;\
+                       find java gnu -name \*.o -not -name '*[A-Z]*';         \
+                       ) > $(shell pwd)/.natbins
+
+
+       cd upstream/gcc-3.3/build-$(target)/$(target)/libjava;\
+       (cat $(shell pwd)/.natbins; echo $(shell pwd)/build/$(platform)/org/ibex/plat/$(platform).cc.o) |\
+               grep -v shs | grep -v SHS |xargs nm |\
+               grep _ZN | c++filt --format java | grep " U " | sed 's_\.class\$$_.class_' | sed 's_ * U __' | sed 's_(.*__' \
+               > $(shell pwd)/.natcalls
+
+       rm -rf build/pruned; mkdir -p build/pruned
+       javac -classpath lib/bcel-5.1.jar:build/class -d build/class src/org/ibex/util/BytecodePruner.java
+       rm -f build/$(platform)/ibex.jar
+       cd build/class; \
+               fastjar cf ../$(platform)/ibex.jar \
+                       `find . -name \*.class | grep -v ibex/plat/` \
+                       org/ibex/plat/$(platform)*.class \
+                       org/ibex/plat/X11*.class \
+                       org/ibex/plat/GCJ*.class \
+                       org/ibex/plat/POSIX*.class
+       java -cp lib/bcel-5.1.jar:build/class org.ibex.util.BytecodePruner \
+               build/$(platform)/ibex.jar:upstream/install/share/java/libgcj-3.3.jar \
+               -o build/pruned \
+               `cat .natcalls`
+
+       rm build/pruned/org/ibex/plat/GCJ*.class
+       cp build/java/org/ibex/plat/GCJ.java build/pruned/org/ibex/plat/
+       cp upstream/gcc-3.3/build-$(target)/$(target)/libjava/java/lang/Object.class build/pruned/java/lang/
+
+       rm -f build/pruned/java/lang/System*.*
+       cp upstream/gcc-3.3/src/libjava/java/lang/System.java build/pruned/java/lang/
+
+#                              -fnew-ra \
+#                              -ffunction-sections \
+#                              -fdata-sections \
+#                              -fomit-frame-pointer \
+#                              -fno-force-mem \
+#                              -fno-force-addr \
+#                              -fbranch-probabilities \
+#                              -fno-schedule-insns \
+#                              -fno-optimize-sibling-calls \
+#                              -fno-if-conversion \
+#                              -fno-thread-jumps \
+#                              -foptimize-static-class-initialization \
+#                              -fno-store-check \
+#                              -fno-bounds-check \
+#                              -fmerge-all-constants \
+#                              -fno-inline-functions \
+#                              -finline-limit=1 \
+
+       cd build/pruned;                                                  \
+               for A in `find . -name \*.class -or -name \*.java`; do    \
+                       echo compiling $$A....;                           \
+                       ../../upstream/install/bin/$(target)-gcj          \
+                               -w -c -Os \
+                               -fCLASSPATH=../../build/$(platform)/ibex.jar \
+                               $$A &&                     \
+                               (mkdir -p ../../build/$(platform)/`dirname $$A`; mv *.o ../../build/$(platform)/`dirname $$A`); \
+               done
 
-## dist.xwt.org ############################################################################
+       rm -f build/$(platform)/ibex.a
+
+       cd upstream/gcc-3.3/build-$(target)/$(target)/libjava;           \
+               $(shell pwd)/upstream/install/$(target)/bin/ar cq        \
+                       $(shell pwd)/build/$(platform)/ibex.a            \
+                       `find $(shell pwd)/build/$(platform) -name \*.o`
+
+       rm -f build/$(platform)/natibex.a
+       cd upstream/gcc-3.3/build-$(target)/$(target)/libjava;           \
+               $(shell pwd)/upstream/install/$(target)/bin/ar cq        \
+                       $(shell pwd)/build/$(platform)/natibex.a         \
+                       `cat $(shell pwd)/.natbins`
+# --relax,-O2,--no-whole-archive,
+       PATH=upstream/install/bin:$$PATH upstream/install/bin/$(target)-gcj          \
+               -Wl,--no-gc-sections,--noinhibit-exec,-rpath,upstream/install/$(target)/lib     \
+               -Wl,-nostdlib,--eh-frame-hdr,-m,elf_i386,-dynamic-linker,/lib/ld-linux.so.2 \
+               --main=org.ibex.plat.$(platform)                                     \
+               -Lupstream/install/$(target)/lib                                     \
+               -Lupstream/install/lib                                               \
+               -Os -w                                                               \
+               -Wl,--whole-archive                                                  \
+               build/$(platform)/ibex.a                                             \
+               -Wl,--no-whole-archive                                               \
+               build/$(platform)/natibex.a                                          \
+               upstream/jpeg-6b/build-$(target)/libjpeg.a                           \
+               $(link_flags)                                                        \
+               upstream/gcc-3.3/build-$(target)/$(target)/boehm-gc/.libs/libgcjgc.a \
+               -lz -ldl -lgcc -lm -lpthread -ldl -lgcc -lc -lgcc \
+               upstream/install/bin/../lib/gcc-lib/i686-pc-linux-gnu/3.3/crtend.o \
+               upstream/install/bin/../lib/gcc-lib/i686-pc-linux-gnu/3.3/../../../../i686-pc-linux-gnu/lib/crtn.o \
+               -o $@
+#      strip build/Linux/ibex.linux
+#      ls -l build/Linux/ibex.linux
+#      upx-ucl-beta --best build/Linux/ibex.linux
+#      ls -l build/Linux/ibex.linux
+
+
+### Builtin Resources ##############################################################################
+
+builtin_src := $(shell find src/org/ibex/builtin -name '*.*' \! -name '*.xcf')
+build/res/fonts/vera: .download_vera-1.10
+       mkdir -p build/res/fonts/vera
+       cd build/res/fonts/vera; ln -fs ../../../../upstream/vera-1.10/ttf-bitstream-vera-1.10/Vera.ttf
+       cd build/res/fonts/vera; ln -fs ../../../../upstream/vera-1.10/ttf-bitstream-vera-1.10/VeraMono.ttf
+       cd build/res/fonts/vera; ln -fs ../../../../upstream/vera-1.10/ttf-bitstream-vera-1.10/VeraSe.ttf
+build/res/builtin.jar: $(builtin_src:src/%=build/res/%) build/res/fonts/vera
+       @echo -e "\n\033[1mzipping            res/* -> .jar: builtin.jar\033[0m"
+       cd build/res; $(jar) cf builtin.jar org/ibex/builtin/scar.png
+#      cd build/res; $(jar) cf builtin.jar $(^:build/res/%=%)
+build/$(platform)/builtin.o: build/res/builtin.jar
+       @echo -e "\n\033[1mwrapping            .jar -> .o: resources.o\033[0m"
+       @(echo "unsigned int builtin_length = ";                                \
+               (wc -c build/res/builtin.jar | sed "s_build.*__");              \
+               echo \;;                                                        \
+               echo "unsigned char builtin_bytes[] = {";                       \
+               hexdump -ve '"0x" 1/1 "%x,\n"' build/res/builtin.jar;           \
+               echo "};") > .builtin.c
+       $(gcc) -c .builtin.c -o build/$(platform)/builtin.o
+
+
+build/mips/%.c.o: src/%.c .download_libmspack-20030726
+       make .install_freetype-2.1.4_mips-unknown-elf target=mips-unknown-elf
+       make .install_libmspack-20030726_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 \
+               -Iupstream/freetype-2.1.4/src/include  \
+               -Iupstream/libmspack-20030726/src/mspack \
+               -c -o $@ $<
+
+build/mips/mipsapps.mips: build/mips/org/ibex/translators/Freetype.c.o build/mips/org/ibex/translators/MSPack.c.o build/mips/org/ibex/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"
+       mkdir -p build/mips build/res
+       upstream/install/bin/mips-unknown-elf-gcc \
+               --static \
+               -march=mips1 \
+               -T upstream/mips/org/xwt/mips/linker.ld \
+               -L upstream/mips/build/org/xwt/mips/ \
+               -L upstream/freetype-2.1.4/src/objs \
+               -L upstream/libmspack-20030726/build-mips-unknown-elf/ \
+               -o $@ \
+               $^ \
+               -lfreetype \
+               -lmspack   \
+               -Wl,--gc-sections
+
+
+### Maintainer ######################################################################################
 
 current_build         := $(shell cat next.build)
-
-dist:
-       # this will fail if we haven't checked-in since the comment is null; we want this.
-#      cvs commit -m '' > /dev/null
-
-       echo "***********************************************************"
-       echo "*  This build is $(current_build)"
-       echo "***********************************************************"
-
-        ifeq ($(shell uname -n),gosset.megacz.com)
-               (make $(silent) dist-private 2>&1) >> .make-dist.out || \
-                       (tail -n 200 .make-dist.out | mail -s "Build $(current_build) FAILED" cvs@xwt.org; false)
-               tail -n 200 .make-dist.out | \
-                       mail -s "Unsigned binaries of $(current_build) are now available" cvs@xwt.org
-        else
-               ssh xwt@xwt.org verbose=$(verbose) /home/xwt/dist \
-                       | grep -v "make...:.\(Entering\|Leaving\).directory"
-        endif
-
-
-dist-private:
-       make $(silent) update-build
-
-       # preserve gcc across builds so we don't have to remake it
-       mv gcc/Makefile Makefile.gcc
-       mkdir -p $(HOME)/dist.xwt.org-gcc
-       rm -rf gcc
-       ln -s $(HOME)/dist.xwt.org-gcc gcc
-       mv Makefile.gcc gcc/Makefile
-
-       # build it
+strip_$(platform) := upstream/install/$(target)/bin/strip build/$(platform)/$(target_bin) -o 
+strip_JVM       := cp build/$(platform)/$(target_bin)
+install-dist:;     $(strip_$(platform)) /var/www/org/xwt/dist/master/ibex-$(current_build).$(target_bin_extension).unsigned
+dist: compile
+       (echo -n 0000; (echo "10k16o16i"; cat next.build | tr a-z A-Z; echo "1+f") | dc) | tail --bytes=5 > next.build-
+       mv next.build- next.build
+       echo -n "Next build will be "; cat next.build
        nice -n 19 make all
+       make install-dist platform=Win32
+       make install-dist platform=Linux
+       make install-dist platform=Solaris
+       make install-dist platform=Darwin
+       make install-dist platform=JVM
+       echo -e "\n\n\n*** DONE ******************************************"
+
+propose-patch:
+       @darcs push --and-apply --edit-description -o .darcspatch -T patches@xwt.org http://darcs.ibex.org/ibex/
+       @(echo "To: patches@xwt.org";\
+        SUB=`grep -A10000 New.patches .darcspatch | grep '^\\[' | cut -b 2- | tr \\\n , | sed s_,_,\ _g | sed "s_, *\\$$__"`;\
+        echo "Subject: $$SUB";\
+        echo;\
+        cat .darcspatch) | /usr/sbin/sendmail -bm -f $(USER)@xwt.org patches@xwt.org;
+       @rm .darcspatch 
 
-       echo
-       echo === dist.xwt.org ==================================
-
-       echo "copying xwt.jar to distribution area..."
-       cp bin-Java2/xwt.jar /var/www/dist.xwt.org/xwt-$(current_build).jar.unsigned
-
-       echo "stripping xwt.exe and copying it to the distribution area..."
-       $(strip) bin-Win32/xwt.exe -o /var/www/dist.xwt.org/xwt-$(current_build).exe.unsigned
-
-       echo "copying xwt.linux to distribution area..."
-       $(strip) bin-Linux/xwt.linux -o /var/www/dist.xwt.org/xwt-$(current_build).linux.unsigned
-
-       echo
-       echo "*** DONE ******************************************"