From 220fdfe36b610a003eb9163949a8b2c78b6530fa Mon Sep 17 00:00:00 2001
From: megacz <megacz@xwt.org>
Date: Fri, 30 Jan 2004 08:04:05 +0000
Subject: [PATCH] 2004/01/19 00:16:53

darcs-hash:20040130080405-2ba56-33be8835cdc6a98bf686474480f51228096b153a.gz
---
 Makefile          |  255 +++++++++++++++++++----------------------------------
 Makefile.upstream |   17 ++--
 2 files changed, 95 insertions(+), 177 deletions(-)

diff --git a/Makefile b/Makefile
index e413644..435eadb 100644
--- a/Makefile
+++ b/Makefile
@@ -4,14 +4,13 @@
 
 #
 
-all:      JVM Linux Win32 Darwin Solaris
-
-clean:
-	rm -rf build
+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"
@@ -25,10 +24,31 @@ platform            := JVM
 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_linker_flags += -Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:$(darwin_libdir)/libGL.dylib
-darwin_linker_flags += -Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGLU.dylib:$(darwin_libdir)/libGLU.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_$(target)
+target_bin                       := xwt.$(target_bin_extension)
+
+jikes_flags        := -nowarn -sourcepath src/
+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)/
+gcj_flags          := -fCLASSPATH=build/java
+g++_flags          := -Iupstream/install/lib/gcc-lib/$(target)/3.3/include/ -Iupstream/install/$(target)/include -Wno-multichar
+gcj                := upstream/install/bin/$(target)-gcj $(gcc_flags) $(gcj_flags)
+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)
+gcc                := upstream/install/bin/$(target)-gcc $(gcc_flags) $(g++_flags)
+jar                := $(shell ((type fastjar &>/dev/null) && echo fastjar) || echo jar)
+
 target_Darwin := powerpc-apple-darwin
 target_Win32  := i686-pc-mingw32
 target_Solaris := sparc-sun-solaris2.7
@@ -37,42 +57,21 @@ target := $(target_$(platform))
 
 gcj: .install_gcc-3.3_$(target); make $(target_bin) link_flags="$(link_flags)" platform=$(platform)
 
-#############################################################################
-# Configurables:
-#
-ifeq ($(platform),Win32)
-target_bin             := build/$(platform)/xwt.exe
-else
-target_bin             := build/$(platform)/xwt.$(shell echo $(platform) | tr A-Z a-z)
-endif
-jikes_flags            := -nowarn -sourcepath src/
-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)/
-gcj_flags              := -fCLASSPATH=build/java
-gcj                    := upstream/install/bin/$(target)-gcj $(gcc_flags) $(gcj_flags)
-gcjh                   := $(shell test -e `pwd`/upstream/install/bin/$(target)-gcjh && echo `pwd`/upstream/install/bin/$(target)-gcjh || echo `pwd`/upstream/install/bin/gcjh)
-g++                    := upstream/install/bin/$(target)-gcj $(gcc_flags)
-gcc                    := upstream/install/bin/$(target)-gcc $(gcc_flags)
-jar                    := $(shell ((type fastjar &>/dev/null) && echo fastjar) || echo jar)
-
 include Makefile.upstream
 
-# figure out what stuff in org.xwt.plat.* this platform requires (its superclasses)
-java_sources      := $(patsubst src/%.java,     build/java/%.java, $(shell find src -name '*.java' | grep -v Preprocessor))
-all_java_sources  := $(java_sources)
+java_sources              := $(patsubst src/%.java,     build/java/%.java, $(shell find src -name '*.java' | grep -v Preprocessor))
+
 
-nonplat_java_sources      := $(filter-out build/java/org/xwt/plat/%, $(java_sources)) build/java/org/xwt/translators/Freetype.java build/java/org/xwt/translators/MSPack.java build/java/org/xwt/translators/MIPSApps.java 
-plat_java_sources         := $(filter build/java/org/xwt/plat/%, $(java_sources))
+### Java Class Files ##############################################################################
 
-build/java/org/xwt/translators/MIPSApps.java: build/mips/mipsapps.mips
-	make build/class/org/xwt/mips/Compiler.class
+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 build/class org.xwt.mips.Compiler MIPSApps build/mips/mipsapps.mips)\
-	 | sed 's,//.*$$,,;'|tr -d '\n'  > $@
+	(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
@@ -80,40 +79,36 @@ build/java/org/xwt/%.java: src/org/xwt/%.java
 	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/c/jpeg/%.c:     upstream/jpeg-6b/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/translators/MIPSApps.class: build/java/org/xwt/translators/MIPSApps.java .jikes
-	@echo -e "\n\033[1mcompiling          .java -> .class: $<\033[0m"
-	mkdir -p build/class/org/xwt/translators
-	./.jikes -g:none $<
-
 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 $<
 
-build/class/org/xwt/mips/Compiler.class: src/org/xwt/mips/*.java
-	make .jikes
-	@echo -e "\n\033[1mcompiling          .java -> .class: $<\033[0m"
-	mkdir -p build/class/org/xwt/mips/
-	./.jikes $<
-
-# this forces a clean build every time because jikes is so damn buggy
-preprocess: $(java_sources)
+oldcompile:; CLASSPATH=$$CLASSPATH:lib/libgcj-minimal.jar:upstream/mips/build javac -d build/class `find build/java/ -name \*.java`
 compile: .compile
-.compile: build/class/org/xwt/translators/MIPSApps.class $(java_sources) .jikes 
+.compile: $(java_sources) .jikes 
 	@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
 
-# PHASE 4: gcj-generated headers
-java_headers          := $(all_java_sources:build/java/%.java=build/h/%.h) 
+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"
@@ -121,58 +116,44 @@ build/h/%.h: build/class/%.class .compile
 	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 .)
 
+
+### 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/translators/MIPSApps.java.o: build/class/org/xwt/translators/MIPSApps.class .install_gcc-3.3_$(target)
+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)/org/xwt/plat/AWT.java.o:
-	touch .empty.c; mkdir -p $(@D); $(gcc) -c .empty.c -o $@;
-build/$(platform)/%.java.o: build/java/%.java .install_gcc-3.3_$(target)
+
+build/$(platform)/%.java.o: build/java/%.java
 	@echo -e "\n\033[1mcompiling          .java -> .o:     $<\033[0m"
 	mkdir -p `dirname $@`
 	$(gcj) -c $< -o $@
 
-headers: $(java_headers)
-
 build/$(platform)/org/xwt/plat/$(platform).cc.o: src/org/xwt/plat/$(platform).cc src/org/xwt/plat/*.cc .configure_jpeg-6b_$(target)
-	@make headers
+	@make $(java_headers)
 	@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 $@
+	$(g++) -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 := $(nonplat_java_sources:build/java/%.java=build/$(platform)/%.java.o)
-
-build/$(platform)/$(platform).ar: $(java_objects) $(plat_java_sources:build/java/%.java=build/$(platform)/%.java.o)
+build/$(platform)/$(platform).ar: $(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)
 $(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 
 	@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)
 
 
-##############################################################################
-# Special treatment:
-#
+### Builtin Resources ##############################################################################
 
 builtin_src := $(shell find src/org/xwt/builtin -name '*.*' \! -name '*.xcf')
 build/res/fonts/vera: .download_vera-1.10
@@ -183,7 +164,6 @@ build/res/fonts/vera: .download_vera-1.10
 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 = ";                                \
@@ -205,10 +185,6 @@ build/JVM/xwt.jar: .compile build/res/builtin.jar
 
 
 
-##############################################################################
-# Freetype
-#
-
 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
@@ -219,7 +195,7 @@ build/mips/%.c.o: src/%.c .download_libmspack-20030726
 		-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
+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"
@@ -234,25 +210,11 @@ build/mips/mipsapps.mips: build/mips/org/xwt/translators/Freetype.c.o build/mips
 		-o $@ \
 		$^ \
 		-lfreetype \
-		-lmspack \
+		-lmspack   \
 		-Wl,--gc-sections
 
-##############################################################################
-# Maintainer stuff: generating numbered builds, proposing patches
-#
 
-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.
+### Maintainer ######################################################################################
 
 propose-patch:
 	@echo -n "Please type a one-line description of this bug: "; \
@@ -281,65 +243,28 @@ 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
-	echo "***********************************************************"
-	echo "*  This build is $(current_build)"
-	echo "***********************************************************"
-
-        ifeq ($(shell uname -n),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
-		# 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)
-
-#		echo -e 'export JAVA_HOME=/usr/lib/j2sdk1.4\n cd /home/xwt\n date=`date +%d-%b-%H%M`\n mkdir xwt-$$date\n cd xwt-$$date\n /usr/bin/cvs -d /cvs co $(this_branch_flag) xwt\n mv xwt/* .\n mv xwt/.* .\n rmdir xwt\n touch .make-dist.out\n nohup make dist &\n echo\n cat .make-dist.out' | ssh xwt@xwt.org | grep -v "make...:.\(Entering\|Leaving\).directory"
-		echo -e 'export JAVA_HOME=/usr/lib/j2sdk1.4\n cd /home/xwt/dist\n/usr/bin/cvs update $(this_branch_flag)\ntouch .make-dist.out\n make clean\n nohup make dist &\n' | ssh xwt@xwt.org | grep -v "make...:.\(Entering\|Leaving\).directory"
-        endif
-
-dist-private:
-	make $(silent) update-build
-
-	# build it
+        ifneq ($(shell uname -n),megacz.com)
+		echo "***********************************************************"
+		echo "*  This build is $(current_build)                                     *"
+		echo "***********************************************************"
+		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 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 build/JVM/xwt.jar /var/www/master.dist.xwt.org/xwt-$(current_build).jar.unsigned
-
-	echo "stripping xwt.exe and copying it to the distribution area..."
-	upstream/install/i686-pc-mingw32/bin/strip build/Win32/xwt.exe \
-		-o /var/www/master.dist.xwt.org/xwt-$(current_build).exe.unsigned
-
-	echo "copying xwt.linux to distribution area..."
-	upstream/install/i686-pc-linux-gnu/bin/strip build/Linux/xwt.linux \
-		-o /var/www/master.dist.xwt.org/xwt-$(current_build).linux.unsigned
-
-#	echo "copying xwt.solaris to distribution area..."
-#	upstream/install/sparc-sun-solaris2.7/bin/strip build/Solaris/xwt.solaris \
-#		-o /var/www/master.dist.xwt.org/xwt-$(current_build).solaris.unsigned
-
-	echo "copying xwt.darwin to distribution area..."
-	upstream/install/powerpc-apple-darwin/bin/strip build/Darwin/xwt.darwin \
-		-o /var/www/master.dist.xwt.org/xwt-$(current_build).darwin.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 ******************************************"
-
-
-# this is for Adam; don't mess with it
-#test: JVM; /System/Library/Frameworks/JavaVM.framework/Versions/1.3.1/Commands/java -jar build/JVM/xwt.jar http://localhost/demo.xwar
-test: JVM; java -jar build/JVM/xwt.jar http://localhost/demo.xwar
-
-oldcompile: preprocess; CLASSPATH=$$CLASSPATH:lib/libgcj-minimal.jar javac -d build/class `find build/java/ -name \*.java`
+	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
diff --git a/Makefile.upstream b/Makefile.upstream
index 841493f..d9f4d12 100644
--- a/Makefile.upstream
+++ b/Makefile.upstream
@@ -152,18 +152,14 @@ endif
 	cd upstream/libmspack-20030726/build-$(target); ln -sf ../src/mspack/* .
 	touch $@
 
+.install_binutils-2.13.2.1_mips-unknown-elf: .install_mips2java; touch $@
+.install_gcc-3.3_mips-unknown-elf:           .install_mips2java; touch $@
 .install_mips2java:
 	mkdir -p upstream/install
 	echo '/1 :pserver:cvs@cvs.xwt.org:2401/ A' >> ~/.cvspass
 	cd upstream; cvs -d :pserver:cvs@cvs.xwt.org:/ co mips
-	cd upstream/mips/upstream; ln -s `cd ../..; pwd`/install
-	make -C upstream/mips
-	touch $@
-
-.install_binutils-2.13.2.1_mips-unknown-elf: .install_mips2java
-	touch $@
-
-.install_gcc-3.3_mips-unknown-elf: .install_mips2java
+	cd upstream/mips/upstream; ln -sf `cd ../..; pwd`/install
+	(cd upstream/mips; make)
 	touch $@
 
 .install_freetype-2.1.4_mips-unknown-elf: .install_mips2java .download_freetype-2.1.4
@@ -198,8 +194,7 @@ endif
 .jikes:
 	@echo -e "\n\033[1mdetecting your jikes installation...\033[0m"
 	echo "#!/bin/sh" > .jikes
-	#echo 'for A in `find build/class -name \*.class`; do mv $$A $$A.old; done;' >> .jikes
-	echo -n 'PATH=upstream/install/bin:$$PATH jikes -classpath lib/libgcj-minimal.jar:build/class $$@ -d build/class/ -sourcepath build/java/ ' >> .jikes
+	echo -n 'PATH=upstream/install/bin:$$PATH jikes -classpath lib/libgcj-minimal.jar:build/class:upstream/mips/build $$@ -d build/class/ -sourcepath build/java/ ' >> .jikes
 	(type jikes && (jikes --version | grep "Version 1.18")) || make .install_jikes-1.18_ target=
 	echo -n "$(jikes_flags) -bootclasspath " >> .jikes
 	echo "public class GetBootClassPath { public static void main(String[] s) { " > GetBootClassPath.java
@@ -208,8 +203,6 @@ endif
 	java -cp . GetBootClassPath >> .jikes
 	rm GetBootClassPath.*
 	echo 'EXIT=$$?' >> .jikes
-	#echo 'for A in `find build/class -name \*.class`; do test -e $$A.old && cmp -s $$A $$A.old && mv $$A.old $$A; done' >> .jikes
-	#echo 'for A in `find build/class -name \*.class`; do test -e $$A.old && rm $$A.old; done' >> .jikes
 	echo 'exit $$EXIT' >> .jikes
 	mv .jikes .jikes+
 	cp .jikes+ .jikes
-- 
1.7.10.4