Index: Makefile
===================================================================
RCS file: /cvs/xwt/Makefile,v
retrieving revision 1.77
diff -u -r1.77 Makefile
--- Makefile	10 Apr 2003 07:10:36 -0000	1.77
+++ Makefile	16 Apr 2003 03:16:49 -0000
@@ -27,13 +27,13 @@
 #gcc_optimizations      := -O9 -ffast-math -fomit-frame-pointer -foptimize-sibling-calls -finline-functions -funroll-loops
 gcc_optimizations      := -O0
 debug                  := 
-gcc_flags              := $(gcc_optimizations) $(debug) -ffunction-sections -fdata-sections -Isrc/org/ijg
+gcc_flags              := $(gcc_optimizations) $(debug) -ffunction-sections -fdata-sections -Isrc/org/ijg -I/usr/X11R6/include
 gcj_flags              := -fCLASSPATH=bin 
 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
-ar                     := $(gcc_path)/$(target)/bin/ar
+gcjh                   := $(gcc_path)/bin/gcjh
+ar                     := ar
 strip                  := $(gcc_path)/$(target)/bin/strip
 jar                    := $(shell ((type fastjar &>/dev/null) && echo fastjar) || echo jar)
 
@@ -136,7 +136,7 @@
 
 gcj: compile $(gcc_path)/bin/$(target)-gcj .headers link
 
-link: $(java_objects) $(cc_objects) $(c_objects) bin-$(platform)/org/xwt/builtin.o
+link: $(java_objects) $(cc_objects) $(c_objects)
 	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) $^ -lstdc++ $(platform_link) bin-$(platform)/org/xwt/plat/platform.ar
@@ -190,6 +190,15 @@
 		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"
+
+Darwin:
+	echo -e "\\n=== Darwin/PPC ========================================="
+	make gcj \
+		platform=Darwin \
+		target=powerpc-apple-darwin6.5 \
+		target_bin=xwt.darwin \
+		platform_link="-L$(gcc-path)/lib -L/usr/X11R6/lib -lX11 -lXext" \
 		platform_java_sources="src/org/xwt/plat/POSIX.java src/org/xwt/plat/X11.java"
 
 Win32: