X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=8a9f8f7018c74c6e55ce683cd0706aeb50396e4b;hb=1d7de542b2adfd312fad0bdfa26e3f852491a8d9;hp=b839eaf344c1cb100676fc12e72400f3d9e4bcf7;hpb=9052d19c365d8a371f2f4d0c0d53417c1ec5c217;p=org.ibex.core.git

diff --git a/Makefile b/Makefile
index b839eaf..8a9f8f7 100644
--- a/Makefile
+++ b/Makefile
@@ -3,13 +3,13 @@
 # The XWT Makefile
 #
 
-all:      JVM Linux Win32 Darwin Java2 Solaris
+all:      JVM Darwin Linux Win32 Solaris
 
 JVM:        build/JVM/xwt.jar
 Linux:    ; make gcj platform=Linux   target=i686-pc-linux-gnu    link_flags="-lX11 -lXext --static"
 Solaris:  ; make gcj platform=Solaris target=sparc-sun-solaris2.7 link_flags="-lX11 -lXext"
 Win32:    ; make gcj platform=Win32   target=i686-pc-mingw32      link_flags="-Wl,--subsystem,windows -lcomdlg32" target_bin=xwt.exe
-Darwin:   ; make gcj platform=Darwin  target=powerpc-apple-darwin link_flags="-lSystem -lmathCommon.A upstream/install/powerpc-apple-darwin/lib/crt1.o"
+Darwin:   ; make gcj platform=Darwin  target=powerpc-apple-darwin link_flags="-lSystem -lmathCommon.A"
 
 
 #############################################################################
@@ -93,16 +93,16 @@ build/$(platform)/jpeg-6b/%.c.o: upstream/jpeg-6b/src/%.c
 	$(gcc) -Ibuild/h -c $< -o $@
 
 # PHASE 5: linking
-$(target_bin).ar: $(java_sources:build/java/%.java=build/$(platform)/%.java.o) build/$(platform)/org/xwt/plat/$(platform).cc.o $(jpeg_object_files)
+build/$(target)/$(target_bin).ar: $(java_sources:build/java/%.java=build/$(platform)/%.java.o) build/$(platform)/org/xwt/plat/$(platform).cc.o $(jpeg_object_files)
 	@echo -e "\n\033[1marchiving             .o -> $(target_bin).ar\033[0m"
-	rm -f $(target_bin).ar
-	upstream/install/$(target)/bin/ar -cq $(target_bin).ar $^
-	upstream/install/$(target)/bin/ranlib $(target_bin).ar
+	rm -f build/$(target)/$(target_bin).ar
+	upstream/install/$(target)/bin/ar -cq build/$(target)/$(target_bin).ar $^
+	upstream/install/$(target)/bin/ranlib build/$(target)/$(target_bin).ar
 
-$(target_bin): $(target_bin).ar
+$(target_bin): build/$(target)/$(target_bin).ar
 	@echo -e "\n\033[1mlinking               .o -> $(target_bin)\033[0m"
 	mkdir -p build/$(platform)
-	PATH=upstream/install/bin:$$PATH $(gcj) --main=org.xwt.Main -o build/$(platform)/$(target_bin) $(target_bin).ar -Lupstream/install/$(target)/lib $(link_flags)
+	PATH=upstream/install/bin:$$PATH $(gcj) --main=org.xwt.Main -o build/$(platform)/$(target_bin) build/$(target)/$(target_bin).ar -Lupstream/install/$(target)/lib $(link_flags)
 
 
 ##############################################################################
@@ -142,9 +142,8 @@ build/mips/%.c.o: src/%.c
 	echo -e "\n\033[1mcompiling $< -> $@ (mips)\033[0m"
 	upstream/install/bin/mips-unknown-elf-gcc -march=r3000 -I upstream/freetype-2.1.4/src/include -c -o $@ $<
 
-build/mips/freetype.mips: build/mips/org/xwt/imp/Freetype.c.o
+build/mips/freetype.mips: build/mips/org/xwt/imp/Freetype.c.o build/mips/org/xwt/imp/crt0.c.o build/mips/org/xwt/imp/syscalls.c.o
 	make .install_freetype-2.1.4_mips-unknown-elf target=mips-unknown-elf
-	make build/mips/org/xwt/imp/Freetype.c.o target=mips-unknown-elf platform=mips
 	@echo -e "\n\033[1mlinking               .o -> .mips:  $@\033[0m"
 	mkdir -p build/mips
 	upstream/install/bin/mips-unknown-elf-gcc \
@@ -153,7 +152,7 @@ build/mips/freetype.mips: build/mips/org/xwt/imp/Freetype.c.o
 		-march=mips1 \
 		-T src/org/xwt/imp/linker.ld \
 		-Lbuild/mips \
-		-Lupstream/freetype-2.1.4/objs \
+		-Lupstream/freetype-2.1.4/src/objs \
 		-o $@ \
 		build/mips/org/xwt/imp/Freetype.c.o \
 		--strip \