X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=5060835b7438131aaf04d2b8ebd5b3210a1f1185;hb=4ba6b1dd489dd908640f290bbe4bf44bd2cf4007;hp=2a6a5dfa1bb776771006d377dc2b6a84e24772a6;hpb=3eabe927b209ebd7cd44de7c9a67413560e5bd55;p=org.ibex.core.git

diff --git a/Makefile b/Makefile
index 2a6a5df..21fafd2 100644
--- a/Makefile
+++ b/Makefile
@@ -1,112 +1,228 @@
-#           
+#############################################################################
+#
 # The XWT Makefile
 #
 
-## Configurables ###########################################################################
-
-jpeg_headers := jpeglib.h jconfig.h jmorecfg.h jerror.h jinclude.h jpegint.h jchuff.h jdhuff.h jdct.h jmemsys.h jversion.h
-jpeg_c_sources := jdapimin.c jdapistd.c jcomapi.c jcparam.c jdmaster.c jdinput.c jdmainct.c jdcoefct.c jdpostct.c jdmarker.c
-jpeg_c_sources += jdhuff.c jdphuff.c jddctmgr.c jidctint.c jidctfst.c jidctflt.c jidctred.c jdsample.c jdcolor.c jdmerge.c
-jpeg_c_sources += jquant1.c jquant2.c jerror.c jutils.c jmemnobs.c jmemmgr.c
-
-# inputs
-java_sources           := $(shell find src -name \*.java)
-java_headers           := $(java_sources:src/%.java=bin/%.h)
-xwar_sources           := $(shell ls src/org/xwt/builtin/*.png src/org/xwt/builtin/*.xwt src/org/xwt/builtin/*.xwf)
-cc_sources             := src/org/xwt/plat/$(platform).cc
-c_sources              := $(jpeg_c_sources:%.c=src/org/ijg/%.c)
-
-# outputs
-java_objects           := $(filter-out bin-$(platform)/org/xwt/plat/%, $(java_sources:src/%.java=bin-$(platform)/%.java.o))
-java_objects           += bin-$(platform)/org/xwt/plat/GCJ.java.o
-java_objects           += $(platform_java_sources:%=bin-$(platform)/org/xwt/plat/%.java.o)
-cc_objects             := $(cc_sources:src/%.cc=bin-$(platform)/%.cc.o)
-c_objects              := $(c_sources:src/%.c=bin-$(platform)/%.c.o)
-
-# tools
-gcc_path               := $(shell pwd)/gcc/install
-#gcc_optimizations      := -O9 -ffast-math -fomit-frame-pointer -foptimize-sibling-calls -finline-functions
-#gcc_optimzations       += -funroll-loops -ffunction-sections -fdata-sections
-gcc_optimizations      := -O2
-debug                  := 
-gcc_flags              := $(gcc_optimizations) $(debug) -Isrc/org/ijg
-gcj_flags              := -fCLASSPATH=src
-gcj                    := $(gcc_path)/bin/$(target)-gcj $(gcj_flags) $(gcc_flags)
-g++                    := $(gcc_path)/bin/$(target)-g++ $(gcc_flags)
-gcc                    := $(gcc_path)/bin/$(target)-gcc $(gcc_flags)
-gcjh                   := $(gcc_path)/bin/$(target)-gcjh
-
-as                     := $(gcc_path)/$(target)/bin/as
-ar                     := $(gcc_path)/$(target)/bin/ar
-ranlib                 := $(gcc_path)/$(target)/bin/ranlib
-strip                  := $(gcc_path)/$(target)/bin/strip
-jar                    := $(shell ((type fastjar &>/dev/null) && echo fastjar) || echo jar)
-
-# 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
+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
+
+JVM:        build/JVM/xwt.jar
+Linux:    ; make gcj platform=Linux   link_flags="-lX11 -lXext"
+Solaris:  ; make gcj platform=Solaris link_flags="-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
+
+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                       := xwt.$(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 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))
+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/%: .install_mips2java
+	@echo linking $@
+	@mkdir -p $(@D)
+	@cd $(@D); ln -sf ../../../../../../upstream/mips/org/xwt/mips/util/$*
+build/java/org/xwt/mips/%: .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/xwt/translators/MIPSApps.class: build/mips/mipsapps.mips .jikes
+	mkdir -p build/java/org/xwt/translators
+	@echo -e "\n\033[1mtranslating        .mips -> .java:  $<\033[0m"
+	(echo -e 'package org.xwt.translators;\nimport org.xwt.mips.*;\n';                           \
+	 java -Xint -cp upstream/mips/build org.xwt.mips.Compiler MIPSApps build/mips/mipsapps.mips) \
+	 | sed 's,//.*$$,,;'| tr -d '\n') > build/java/org/xwt/translators/MIPSApps.java
+	@echo -e "\n\033[1mcompiling          .java -> .class: $<\033[0m"
+	./.jikes -g:none build/java/org/xwt/translators/MIPSApps.java
+
+build/java/org/xwt/%.java: src/org/xwt/%.java
+	make build/class/org/xwt/util/Preprocessor.class
+	@echo -e "\n\033[1mpreprocessing      .java -> .java:  $<\033[0m"
+	mkdir -p `dirname $@`; java -cp build/class org.xwt.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'`/$< $@
+
+build/class/org/xwt/util/Preprocessor.class: src/org/xwt/util/Preprocessor.java .jikes
+	@echo -e "\n\033[1mcompiling          .java -> .class: $<\033[0m"
+	mkdir -p build/class/org/xwt/util/
+	./.jikes $<
+
+oldcompile:; CLASSPATH=$$CLASSPATH:lib/libgcj-minimal.jar:upstream/mips/build javac -d build/class `find build/java/ -name \*.java`
+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
+	@./.jikes $(java_sources)
+	touch .compile
+
+build/JVM/xwt.jar: .compile build/res/builtin.jar
+	@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 -sf ../../../res/builtin.jar
+	cd build/class; $(jar) cfm ../JVM/xwt.jar ../JVM/.manifest \
+		`find . \! -type d \! -path './org/xwt/mips/*'` \
+		$(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 $@`
+	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 .)
 
-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 Darwin Carbon
-
-.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
-
-update-build:
-	cvs tag -F xwt-$(current_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.
+
+### Native Code ##############################################################################
+
+# 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)/org/xwt/translators/MIPSApps.java.o: build/class/org/xwt/translators/MIPSApps.class
+	@echo -e "\n\033[1mcompiling         .class -> .o:     $<\033[0m"
+	mkdir -p `dirname $@`
+	$(gcj) -Os -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 .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/xwt/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)
+build/$(platform)/$(target_bin): build/$(platform)/org/xwt/plat/$(platform).cc.o upstream/jpeg-6b/build-$(target)/libjpeg.a build/$(platform)/builtin.o build/$(platform)/$(platform).ar build/$(platform)/org/xwt/plat/$(platform).java.o
+	@echo -e "\n\033[1mlinking               .o -> $(target_bin)\033[0m"
+	mkdir -p build/$(platform)
+	PATH=upstream/install/bin:$$PATH $(gcj) -v --main=org.xwt.Main -o $@ -Lupstream/install/$(target)/lib build/$(platform)/org/xwt/plat/$(platform).java.o $^ $(link_flags)
+
+
+### Builtin Resources ##############################################################################
+
+builtin_src := $(shell find src/org/xwt/builtin -name '*.*' \! -name '*.xcf')
+build/res/fonts/vera: .download_vera-1.10
+	mkdir -p build/res/fonts/vera
+	cd build/res/fonts/vera; ln -s ../../../../upstream/vera-1.10/ttf-bitstream-vera-1.10/Vera.ttf
+	cd build/res/fonts/vera; ln -s ../../../../upstream/vera-1.10/ttf-bitstream-vera-1.10/VeraMono.ttf
+	cd build/res/fonts/vera; ln -s ../../../../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 $(^: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/xwt/translators/Freetype.c.o build/mips/org/xwt/translators/MSPack.c.o build/mips/org/xwt/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 ######################################################################################
 
 propose-patch:
 	@echo -n "Please type a one-line description of this bug: "; \
@@ -131,195 +247,32 @@ propose-patch:
 	) > .message
 	bash -c "cat .message > /dev/tcp/mail.xwt.org/25"     # /dev/tcp is faked by bash; not part of the os
 
-## 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/install/bin/$(target)-gcj:
-	make -C gcc
-
-# 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)
-gcj: $(gcc_path)/bin/$(target)-gcj compile $(target_bin)
-
-$(target_bin): $(java_objects) $(cc_objects) $(c_objects) bin-$(platform)/org/xwt/builtin.o
-	@echo "linking        .o -> $(target_bin)"
-	$(gcj) --main=org.xwt.Main -o bin-$(platform)/$(target_bin) $^ $(platform_link) 
-
-bin-$(platform)/org/xwt/builtin.o: bin/org/xwt/builtin.xwar
-	@echo "wrapping    .xwar -> .o:     bin/org/xwt/builtin.o"
-	@(echo "unsigned int builtin_xwar_length = ";\
-	  (wc -c bin/org/xwt/builtin.xwar | sed "s_bin.*__");\
-	  echo \;;\
-	  echo "unsigned char builtin_xwar[] = {";\
-	  hexdump -ve '"0x" 1/1 "%x,\n"' bin/org/xwt/builtin.xwar;\
-	  echo "};") > .builtin.c
-	$(gcc) -c .builtin.c -o bin-$(platform)/org/xwt/builtin.o
-
-$(java_headers): bin/%.h: bin/%.class
-	@echo "extracting .class -> .h:     $<"
-	cd bin; find `echo $< | sed s/.class$$// | sed s_^bin/__ `*.class |\
-		sed s_/_._g | sed s/.class$$// | sed s/.java$$// |\
-			xargs $(gcjh) --classpath .
-
-$(java_objects): bin-$(platform)/%.java.o: src/%.java
-	@echo "compiling   .java -> .o:     $<"
-	mkdir -p `dirname $@`
-	$(gcj) -c $< -o $@
-
-# unpack and patch the ijg library
-src/org/ijg/jmorecfg.h: src/org/ijg/jpegsrc.v6b.tar.gz src/org/ijg/jmorecfg.h.patch
-	cd src/org/ijg/; tar xzf jpegsrc.v6b.tar.gz
-	cd src/org/ijg/jpeg-6b; ./configure --target=$(target)
-	cd src/org/ijg/jpeg-6b; mv $(jpeg_c_sources) $(jpeg_headers) ..
-	cd src/org/ijg; patch -l -p0 < jmorecfg.h.patch
-	rm -rf src/org/ijg/jpeg-6b
-
-$(cc_objects): bin-$(platform)/%.cc.o: src/%.cc $(java_headers) src/org/ijg/jmorecfg.h
-	@echo "compiling     .cc -> .o:     $<"
-	@mkdir -p `dirname $@`
-	$(g++) -I/usr/X11R6/include/ -I$(gcc_path)/include -Ibin -Iupstream/$(platform)/include -Wno-multichar -c $< -o $@
-
-$(c_objects): bin-$(platform)/%.c.o: src/%.c src/org/ijg/jmorecfg.h
-	@echo "compiling      .c -> .o:     $<"
-	@mkdir -p `dirname $@`
-	$(gcc) -Ibin -c $< -o $@
-
-upstream:
-	cvs -d :pserver:cvs@cvs.xwt.org:/ export -r HEAD upstream
-
-upstream/Carbon/include/Carbon:
-	# A disgusting hack to create symlinks to the OS X Framework headers, since the
-	# standard GCC doesn't know how to search Frameworks for header files.
-	outdir="upstream/Carbon/include"; \
-	librarydir="/System/Library"; \
-	frameworksubdir="Frameworks"; \
-	cd $$outdir; \
-	function CreateHeaderDirectories() \
-	{ \
-		for framework in `ls -d $$1/*.framework`; do \
-			name=`echo $$framework | sed 's/.*\/\([^/]*\)\.framework/\1/'`; \
-			if [[ $$name != "" && ! -e $$name && -e $$framework/Headers ]]; then \
-				ln -s $$framework/Headers $$name; \
-				if [[ -e $$framework/$$frameworksubdir ]]; then \
-					CreateHeaderDirectories $$framework/$$frameworksubdir; \
-				fi; \
-			fi; \
-		done; \
-	}; \
-	CreateHeaderDirectories $$librarydir/$$frameworksubdir;
-
-## 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="POSIX X11"
-
-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="Win32"
-
-Darwin: upstream
-	echo -e "\\n=== Darwin ========================================="
-	ranlib upstream/Darwin/lib/*.a
-	ar x /usr/lib/libcc_dynamic.a upstream/Darwin/lib/darwin-fpsave.o
-	make gcj \
-		platform=Darwin \
-		target=powerpc-apple-darwin \
-		target_bin=xwt.darwin \
-		platform_link="upstream/Darwin/lib/*.[oa] $(gcc_path)/lib/libgcj.a" \
-		platform_java_sources="POSIX X11"
-
-Carbon: upstream/Carbon/include/Carbon upstream
-	echo -e "\\n=== Carbon ========================================="
-	make gcj \
-		platform=Carbon \
-		target=powerpc-apple-darwin \
-		target_bin=xwt.carbon \
-		platform_link="$(gcc_path)/lib/libgcj.a -Xlinker -framework -Xlinker Carbon" \
-		platform_java_sources="POSIX Carbon"
-
-Java2: compile 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; $(jar) cvfm ../bin-Java2/xwt.jar .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
-
-PalmOS:
-	echo "PalmOS is not yet supported"
-	false
-
-
-## master.dist.xwt.org ############################################################################
-
 current_build         := $(shell cat next.build)
 this_branch           := $(shell tail -c +2 CVS/Tag 2>/dev/null || echo HEAD)
 this_branch_flag      := $(shell test $(this_branch) = HEAD && echo || echo -r $(this_branch))
 
-# pre-depend on compile as a sanity check
+strip_$(target) := upstream/install/$(target)/bin/strip build/$(platform)/$(target_bin) -o 
+strip_JVM       := cp build/$(platform)/$(target_bin)
+install-dist:;     $(strip_$(target)) /var/www/master.dist.xwt.org/xwt-$(current_build).$(target_bin_extension).unsigned
 dist: compile
-	# this will fail if we haven't checked-in since the comment is null; we want this.
-	cvs commit -m '' > /dev/null
-	cvs tag -F xwt-$(current_build)
-
+ifneq ($(shell uname -n),megacz.com)
 	echo "***********************************************************"
-	echo "*  This build is $(current_build)"
+	echo "*  This build is $(current_build)                                     *"
 	echo "***********************************************************"
-
-        ifeq ($(shell uname -n),serverbeach.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 $(this_branch_flag) \
-			| 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
-	mkdir -p $(HOME)/dist.xwt.org-gcc
-	mv gcc gcc-
-	ln -s $(HOME)/dist.xwt.org-gcc gcc
-	mv -f gcc-/Makefile gcc/
-	mv -f gcc-/gcc.patch gcc/
-
-	# build it
+	cvs commit -m '' > /dev/null     # this will fail if we haven't checked-in since the comment is null; we want this.
+	echo -e 'cd /home/xwt/\nrm -rf xwt\n/usr/bin/cvs -d /cvs co xwt\nnohup make -C xwt dist 2>&1 >> .make-dist.out &\n' |\
+		 ssh xwt@xwt.org | grep -v "make...:.\(Entering\|Leaving\).directory"
+else
+	(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 -e \n`date +%d-%b`" =========== build $(current_build) ================" >> CHANGES
+	cvs commit -m 'this comment should not appear in CHANGES' next.build CHANGES
 	nice -n 19 make all
-
-	echo
-	echo === master.dist.xwt.org ==================================
-
-	echo "copying xwt.jar to distribution area..."
-	cp bin-Java2/xwt.jar /var/www/master.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/master.dist.xwt.org/xwt-$(current_build).exe.unsigned
-
-	echo "copying xwt.linux to distribution area..."
-	$(strip) bin-Linux/xwt.linux -o /var/www/master.dist.xwt.org/xwt-$(current_build).linux.unsigned
-
-	echo "creating source tarball in distribution area..."
-	CVSROOT=/cvs cvs export -r xwt-$(current_build) xwt
-	mv xwt xwt-$(current_build)
-	tar cvzf /var/www/master.dist.xwt.org/xwt-$(current_build).tgz xwt-$(current_build)
-
-	echo
-	echo "*** DONE ******************************************"
+	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 ******************************************"
+endif