X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=Makefile;h=e38135e41a3ef1c97823ac44f976567e9a7d69bf;hb=d8ee62e5c00b793cce08bb509ed0a46841238ba8;hp=0bfa5ea9c47eac8492cd848871bb705ac7c7ee99;hpb=1e651bf5d79cc35fa6212766ed4a958cb265fad0;p=org.ibex.core.git

diff --git a/Makefile b/Makefile
index 0bfa5ea..e38135e 100644
--- a/Makefile
+++ b/Makefile
@@ -134,20 +134,20 @@ build/xwar/org/xwt/builtin.xwar: $(shell ls src/org/xwt/builtin/*.*)
 	mkdir -p build/xwar
 	cd src; $(jar) cvf ../build/xwar/builtin.xwar org/xwt/builtin
 
-build/$(platform)/builtin.res.o: build/xwar/org/xwt/builtin.xwar
+build/$(platform)/org/xwt/builtin.res.o: build/xwar/org/xwt/builtin.xwar
 	@echo -e "\n\033[1mwrapping           .xwar -> .o: builtin.res.o\033[0m"
 	@(echo "unsigned int builtin_xwar_length = ";                           \
-		(wc -c build/xwar/org/xwt/builtin.xwar | sed "s_bin.*__");      \
+		(wc -c build/xwar/builtin.xwar | sed "s_build.*__");            \
 		echo \;;                                                        \
 		echo "unsigned char builtin_xwar[] = {";                        \
-		hexdump -ve '"0x" 1/1 "%x,\n"' build/xwar/org/xwt/builtin.xwar; \
+		hexdump -ve '"0x" 1/1 "%x,\n"' build/xwar/builtin.xwar;         \
 		echo "};") > .builtin.c
 	$(gcc) -c .builtin.c -o build/$(platform)/org/xwt/builtin.res.o
 
-build/$(platform)/freetype.res.o: build/mips/org/xwt/freetype.mips
+build/$(platform)/freetype.res.o: build/mips/freetype.mips
 	@echo -e "\n\033[1mwrapping           .mips -> .o: freetype.res.o\033[0m"
 	@(echo "unsigned int freetype_mips_length = ";                           \
-		(wc -c build/mips/freetype.mips | sed "s_bin.*__");              \
+		(wc -c build/mips/freetype.mips | sed "s_build.*__");            \
 		echo \;;                                                         \
 		echo "unsigned char freetype_mips[] = {";                        \
 		hexdump -ve '"0x" 1/1 "%x,\n"' build/mips/freetype.mips;         \
@@ -159,12 +159,12 @@ build/$(platform)/freetype.res.o: build/mips/org/xwt/freetype.mips
 # having the individual .o's depend on the .java's (otherwise every .o gets recompiled when one .java changes)
 gcj: .compile .vendor .install_gcc-3.3_$(target) $(target_bin)
 
-build/JVM/xwt.jar: .compile build/xwar/org/xwt/builtin.xwar build/mips/freetype.mips
+build/JVM/xwt.jar: .compile build/xwar/builtin.xwar build/mips/freetype.mips
 	@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 -s ../../../xwar/org/xwt/builtin.xwar  # HACK
-	cd build/class/org/xwt/; ln -s ../../../mips/freetype.mips         # HACK
+	cd build/class/org/xwt/; ln -fs ../../../xwar/builtin.xwar  # HACK
+	cd build/class/org/xwt/; ln -fs ../../../mips/freetype.mips         # HACK
 	cd build/class; $(jar) cfm ../JVM/xwt.jar ../JVM/.manifest `find .`;
 	rm build/class/org/xwt/builtin.xwar
 	rm build/class/org/xwt/freetype.mips