X-Git-Url: http://git.megacz.com/?p=org.ibex.core.git;a=blobdiff_plain;f=Makefile;h=239f18efdbfd7596ba9277044dd8b2b7e769cc42;hp=f79a9d03367ee6a2fe20c196f2327bebf2655d24;hb=90c5107bee21062f773cad22aab2a9f1c41e8930;hpb=68c1b0597264dc405b3ce91e8b6f56a4376198e1

diff --git a/Makefile b/Makefile
index f79a9d0..239f18e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,100 +1,233 @@
-#           
+#############################################################################
+#
 # 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
+all:                   JVM Linux Win32 Java2 #Solaris
+.SILENT: $(cc_objects) $(java_objects) $(java_headers) all build/xwar/builtin.xwar $(target_bin) compile
+
+
+#############################################################################
+# Configurables:
+#
+target_bin             := xwt.$(shell echo $(platform) | tr A-Z a-z)
+jikes_flags            := -verbose -nowarn -sourcepath src/
+gcc_path               := upstream/install
 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)
+#gcc_optimizations      := -O9 -ffast-math -fomit-frame-pointer -foptimize-sibling-calls -finline-functions -funroll-loops -ffunction-sections -fdata-sections
+gcc_flags              := $(gcc_optimizations) -Ibuild/h
+gcj_flags              += -fCLASSPATH=build/java
+gcj                    := $(gcc_path)/bin/$(target)-gcj $(gcc_flags) $(gcj_flags)
 g++                    := $(gcc_path)/bin/$(target)-g++ $(gcc_flags)
 gcc                    := $(gcc_path)/bin/$(target)-gcc $(gcc_flags)
-gcjh                   := $(gcc_path)/bin/$(target)-gcjh
 
+gcjh                   := $(gcc_path)/bin/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
-
-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 Solaris
-
-.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/%=%)
+
+
+#############################################################################
+# Overview:
+# 
+# The Makefile has been divided into phases; each phase depends on the
+# previous one.  Subphases of the same phase (ie 1a, 1b) are not
+# interdependent.  You can think of the build process as proceeding
+# through the phases in order, but processing subphases within a given
+# phase in any order.
+#
+
+
+# PHASE 1a: upstream code
+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
+jpeg_sources      := $(jpeg_c_sources:%.c=upstream/jpeg-6b/src/%.c)
+$(jpeg_sources):
+	make -sC upstream jpeg-6b/src
+
+freetype_sources    := $(patsubst %,upstream/freetype-2.1.4/src/src/base/%,ftsystem.c ftmm.c ftbbox.c ftinit.c ftdebug.c ftbase.c ftglyph.c)
+freetype_sources    += $(patsubst %,upstream/freetype-2.1.4/src/src/%,smooth/smooth.c autohint/autohint.c sfnt/sfnt.c truetype/truetype.c)
+$(freetype_sources):
+	make -sC upstream freetype-2.1.4/.installed
+
+upstream/.jikes:
+	make -sC upstream .jikes
+
+$(gcc_path)/bin/$(target)-gcj:
+	make -sC upstream gcc-3.3-$(target)
+
+
+# PHASE 1b: human-written inputs
+handwritten_java_sources      := $(shell find src -name \*.java)
+handwritten_java_pp_sources   := $(shell find src -name \*.java.pp)
+handwritten_mips_sources      := $(shell find src -name \*.mips.c)
+handwritten_cc_sources        := src/org/xwt/plat/$(platform).cc
+handwritten_c_sources         := $(jpeg_sources)
+handwritten_xwar_sources      := $(shell ls src/org/xwt/builtin/*.png src/org/xwt/builtin/*.xwt src/org/xwt/builtin/*.xwf)
+
+
+# PHASE 2: ready-to-compile java files (either symlinked to phase 1a sources or else generated from them)
+java_sources    := $(handwritten_java_sources:src/%.java=build/java/%.java)
+java_sources    += $(handwritten_java_pp_sources:src/%.java.pp=build/java/%.java)
+java_sources    += $(handwritten_mips_sources:src/%.mips.c=build/java/%.java)
+java_sources    += build/java/org/xwt/Builtin.java
+#java_sources    += build/java/org/xwt/imp/Freetype.java
+$(handwritten_java_sources:src/%.java=build/java/%.java): build/java/%.java: src/%.java
+	@echo "symlinking:                         $@"
+	@mkdir -p `dirname $@`;  \
+	cd `dirname $@`;                        \
+	A=`echo $@ | sed 's_[^/]*/_../_g'`;     \
+	B=`dirname $$A`;                        \
+	C=$$B/$<;                               \
+	ln -s $$C
+
+
+# PHASE 3: class files
+class_files           := $(java_sources:build/java/%.java=build/class/%.class)
+$(class_files): build/class/%.class: build/java/%.java upstream/.jikes
+	@echo "compiling          .java -> .class: $<"
+	@mkdir -p build/class
+	@upstream/.jikes $<
+
+compile: .compile
+.compile: $(java_sources)
+	@echo "compiling          .java -> .class: src/**/*.java"
+	@mkdir -p build/class
+	@upstream/.jikes $(java_sources)
+	@touch .compile
+
+# PHASE 4: gcj-generated headers
+java_headers          := $(java_sources:build/java/%.java=build/h/%.h)
+$(java_headers): build/h/%.h: build/class/%.class .compile
+	@echo "extracting        .class -> .h:     $<"
+	@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 .)
+
+# PHASE 4: object files
+java_object_files          := $(filter-out build/$(platform)/org/xwt/plat/%,$(java_sources:build/java/%=build/$(platform)/%.o))
+java_object_files          += $(patsubst %,build/$(platform)/org/xwt/plat/%.java.o,GCJ $(platform_java_sources))
+cc_object_files            := $(handwritten_cc_sources:src/%.cc=build/$(platform)/%.cc.o)
+c_object_files             := $(handwritten_c_sources:upstream/jpeg-6b/src/%.c=build/$(platform)/jpeg-6b/%.c.o)
+$(java_object_files): build/$(platform)/%.java.o: build/java/%.java
+	@echo "compiling          .java -> .o:     $<"
+	@mkdir -p `dirname $@`
+	@$(gcj) -c $< -o $@
+$(cc_object_files): build/$(platform)/%.cc.o: src/%.cc $(java_headers)
+	@echo "compiling            .cc -> .o:     $<"
+	@mkdir -p `dirname $@`
+	@$(g++) -I/usr/X11R6/include/ -I$(gcc_path)/include -Ibuild/h -Iupstream/$(platform)/include -Wno-multichar -c $< -o $@
+$(c_object_files): build/$(platform)/jpeg-6b/%.c.o: upstream/jpeg-6b/src/%.c
+	@echo "compiling             .c -> .o:     $<"
+	@mkdir -p `dirname $@`
+	@$(gcc) -Ibuild/h -c $< -o $@
+
+# PHASE 5: linking
+$(target_bin): $(java_object_files) $(cc_object_files) $(c_object_files)
+	@echo "linking               .o -> $(target_bin)"
+	@mkdir -p build/$(platform)
+	@$(gcj) --main=org.xwt.Main -o build/$(platform)/$(target_bin) $^ $(platform_link) 
+
+
+##############################################################################
+# Special treatment:
+#
+
+build/java/org/xwt/Builtin.java:: $(handwritten_xwar_sources)
+	@mkdir -p `dirname $@` build build/java build/class build/h build
+	@echo "zipping/uuencoding  .xwt -> .java:  build/java/org/xwt/Builtin.java"
+	@echo "package org.xwt;"                  >  build/java/org/xwt/Builtin.java
+	@echo "class Builtin {"                   >> build/java/org/xwt/Builtin.java
+	@echo "public static String encoded = "   >> build/java/org/xwt/Builtin.java
+	@cd src; $(jar) cf - $(handwritten_xwar_sources:src/%=%) | \
+		uuencode foo | tail -n +2 | grep -v '^end$$' | grep -v '^`$$' | \
+		sed 's_\(.+\)_"\1" +_' >> ../build/java/org/xwt/Builtin.java
+	@echo "\"\"; }"                           >> build/java/org/xwt/Builtin.java
+
+postprocessed_sources   := $(handwritten_java_pp_sources:src/%.pp=build/java/%)
+$(postprocessed_sources):  build/java/%.java: src/%.java.pp build/class/org/xwt/util/Preprocessor.class
+	@echo "preprocessing   .java.pp -> .java:  $<"
+	@mkdir -p `dirname $@`
+	@rm -f $@
+	@java -cp build/class org.xwt.util.Preprocessor < $< > $@
+
+build/java/org/xwt/imp/Freetype.java:: build/mips/freetype.mips build/class/org/xwt/imp/MIPS.class
+	@echo "translating        .mips -> .java:  $@"
+	@mkdir -p build/java/org/xwt/imp/
+	@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
+
+build/mips/freetype.mips: $(freetype_mips_objects)
+	@echo "compiling             .c -> .mips:  $@"
+	@mkdir -p build/mips
+	@make -sC upstream newlib-1.11.0/src newlib-1.11.0/build-mips/.installed gcc-3.3-mips freetype-2.1.4/src .headers target=mips
+	@$(gcc_path)/bin/mips-gcc \
+		--static \
+		-mabi=32 \
+		-mips1 \
+		-msoft-float \
+		-o $@ \
+		-I upstream/freetype-2.1.4/src/include \
+		$(freetype_sources) \
+		-mno-crt0 \
+		-Tnullmon.ld \
+		-Wl,--warn-once \
+		src/org/xwt/imp/Freetype.c \
+		-Wl,-s
+
+
+
+##############################################################################
+# Supported Platforms:
+#
+
+# 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: $(gcc_path)/bin/$(target)-gcj compile $(target_bin)
+	@echo -e "\\n=== $(target) ========================================="
+
+Linux:
+	@make gcj platform=Linux target=i686-pc-linux-gnu platform_link="-L$(gcc_path)/lib -L/usr/X11R6/lib -lX11 -lXext --static" platform_java_sources="POSIX X11"
+
+Solaris:
+	@make gcj platform=Solaris target=sparc-sun-solaris2.7 platform_link="-L$(gcc_path)/lib -lX11 -lXext" platform_java_sources="POSIX X11"
+
+Win32:
+	@make gcj platform=Win32 target=i686-pc-mingw32 target_bin=xwt.exe platform_link="-Wl,--subsystem,windows -lcomdlg32" platform_java_sources=Win32
+
+Carbon:
+	@make gcj platform=Carbon arget=powerpc-apple-darwin platform_link="$(gcc_path)/lib/libgcj.a -Xlinker -framework -Xlinker Carbon" platform_java_sources="POSIX Carbon"
+
+JVM: build/JVM/xwt.jar
+build/JVM/xwt.jar:.compile
+	@echo "archiving         .class -> .jar:   build/JVM/xwt.jar"
+	@mkdir -p build/JVM
+	@echo -e "Manifest-Version: 1.0\nMain-Class: org.xwt.Main\n" > build/JVM/.manifest
+	@cd build/class; $(jar) cfm ../JVM/xwt.jar ../JVM/.manifest \
+		`find . -name \*.class | grep -v org/xwt/plat/` \
+		org/xwt/plat/AWT*.class org/xwt/plat/Java2*.class
+	@echo
+
+
+
+##############################################################################
+# Misc
+#
 
 clean:
-	rm -rf bin-* bin
 	find . -name \*~ | xargs rm -f
 	find . -name \#\*\# | xargs rm -f
 
+
+
+##############################################################################
+# 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-
@@ -131,131 +264,6 @@ 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: .upstream
-	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:
-	mkdir -p gcc/install; curl http://www.megacz.com/upstream.tgz | tar xvzhf - -C gcc/install
-	touch .upstream
-
-
-## 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"
-
-Solaris:
-	echo -e "\\n=== Solaris ========================================="
-	make gcj \
-		platform=Solaris \
-		target=sparc-sun-solaris2.7 \
-		target_bin=xwt.solaris \
-		platform_link="-L$(gcc_path)/lib -lX11 -lXext" \
-		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,console -lcomdlg32" \
-		platform_java_sources="Win32"
-
-Darwin:
-	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:
-	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))
@@ -279,7 +287,6 @@ dist: compile
 		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 &> /dev/null &\n echo\n cat .make-dist.out' | ssh xwt@xwt.org | grep -v "make...:.\(Entering\|Leaving\).directory"
         endif
 
-
 dist-private:
 	make $(silent) update-build
 
@@ -297,13 +304,13 @@ dist-private:
 	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
+	cp 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
+	$(strip) build/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
+	$(strip) build/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
@@ -312,3 +319,20 @@ dist-private:
 
 	echo
 	echo "*** DONE ******************************************"
+
+
+
+
+
+
+
+#mips: $(prefix)/mips/lib/libm.a
+#$(prefix)/mips/lib/libm.a: src/.newlib $(prefix)/bin/mips-gcc
+#	mkdir -p build/$(target)/newlib
+#	cd build/$(target)/newlib; PATH=$(prefix)/bin:$$PATH \
+#		../../../src/newlib-1.11.0/configure --nfp --enable-multilib --prefix=$(prefix) --target=mips
+#	cd build/$(target)/newlib; PATH=$(prefix)/bin:$$PATH EXTRA_CFLAGS=-mstrict-align make
+#	cd build/$(target)/newlib; make install
+# FIXME: this is probably going to cause problems... figure out how to get by without it
+#	touch .empty.c
+#	$(prefix)/bin/mips-gcc -c .empty.c -o $(prefix)/mips/lib/crt0.o