X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=7d0cb52d8a3f893f1104bcd6d2152780187690d7;hb=38786988d12f2c48a314ee37c326965ff0bcadb6;hp=84c8b24b12deddf6cd6278456c41b7d500e833e4;hpb=6bc8259d72f08e1f25f42d495bbd993dfc9acb2d;p=org.ibex.core.git

diff --git a/Makefile b/Makefile
index 84c8b24..7d0cb52 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,7 @@
 #############################################################################
 #
 # The XWT Makefile
+
 #
 
 all:      JVM Darwin Linux Win32 Solaris
@@ -131,8 +132,8 @@ $(target_bin): build/$(platform)/$(platform).ar upstream/jpeg-6b/build-$(target)
 # Special treatment:
 #
 
-builtin_src := $(find src/org/xwt/builtin)
-build/res/resources.jar: $(builtin_src:src/%=build/res/%) build/res/freetype.mips
+builtin_src := $(shell find src/org/xwt/builtin -name '*.*')
+build/res/builtin.jar: $(builtin_src:src/%=build/res/%) build/res/freetype.mips
 	@echo -e "\n\033[1mzipping            res/* -> .jar: builtin.jar\033[0m"
 	cd build/res; $(jar) cf builtin.jar $(^:build/res/%=%)
 
@@ -150,11 +151,12 @@ build/$(platform)/builtin.o: build/res/builtin.jar
 # having the individual .o's depend on the .java's (otherwise every .o gets recompiled when one .java changes)
 gcj: .vendor .install_gcc-3.3_$(target) $(target_bin)
 
-build/JVM/xwt.jar: $(java_sources:build/java/%.java=build/class/%.class)
+build/JVM/xwt.jar: $(java_sources:build/java/%.java=build/class/%.class) 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; $(jar) cfm ../JVM/xwt.jar ../JVM/.manifest `find .`;
+	cd build/class/org/xwt; ln -sf ../../../res/builtin.jar
+	cd build/class; $(jar) cfm ../JVM/xwt.jar ../JVM/.manifest `find . \! -type d`;
 
 
 
@@ -171,7 +173,7 @@ build/mips/%.c.o: src/%.c
 build/res/freetype.mips: build/mips/org/xwt/translators/Freetype.c.o build/mips/org/xwt/mips/crt0.c.o build/mips/org/xwt/mips/syscalls.c.o
 	make .install_freetype-2.1.4_mips-unknown-elf target=mips-unknown-elf
 	@echo -e "\n\033[1mlinking               .o -> .mips:  $@\033[0m"
-	mkdir -p build/mips
+	mkdir -p build/mips build/res
 	upstream/install/bin/mips-unknown-elf-gcc \
 		-nostdlib \
 		--static \