X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=8cd4135a15347fefc4635291c4814904244120c7;hb=134e61c5950f264959664b71a7beeacf63b0fc26;hp=bb82c5fe0e3a2504dfa17c7d70c2bfc1be1f151e;hpb=929a33405c0de48f920e956ab83c1962a8e1baa0;p=org.ibex.core.git

diff --git a/Makefile b/Makefile
index bb82c5f..8cd4135 100644
--- a/Makefile
+++ b/Makefile
@@ -7,6 +7,9 @@
 all:      JVM Linux Win32 Darwin #Solaris
 
 clean:
+	rm -rf build
+
+dist-clean:
 	rm -rf .jikes .configure* .install* build .compile .build*
 	find upstream -name config.cache -exec rm {} \;
 
@@ -193,7 +196,7 @@ build/mips/%.c.o: src/%.c
 	echo -e "\n\033[1mcompiling $< -> $@ (mips)\033[0m"
 	upstream/install/bin/mips-unknown-elf-gcc -march=r3000 \
 		-Iupstream/freetype-2.1.4/src/include  \
-		-Iupstream/libmspack-20030726/libmspack/mspack \
+		-Iupstream/libmspack-20030726/src/mspack \
 		-c -o $@ $<
 
 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
@@ -211,7 +214,8 @@ build/res/freetype.mips: build/mips/org/xwt/translators/Freetype.c.o build/mips/
 		$^ \
 		-lfreetype
 
-.install_libmspack-20030726:; make .install_libmspack-20030726_mips-unknown-elf target=mips-unknown-elf
+.install_libmspack-20030726:
+	make .install_libmspack-20030726_mips-unknown-elf target=mips-unknown-elf && touch .install_libmspack-20030726
 build/mips/org/xwt/translators/MSPack.c.o: .install_libmspack-20030726
 build/res/libmspack.mips: build/mips/org/xwt/translators/MSPack.c.o build/mips/org/xwt/mips/crt0.c.o build/mips/org/xwt/mips/syscalls.c.o
 	@echo -e "\n\033[1mlinking               .o -> .mips:  $@\033[0m"
@@ -331,7 +335,7 @@ dist-private:
 
 
 # this is for Adam; don't mess with it
-test: JVM; /System/Library/Frameworks/JavaVM.framework/Versions/1.3.1/Commands/java -jar build/JVM/xwt.jar http://localhost/demo.xwar
-#test: JVM; java -jar build/JVM/xwt.jar http://localhost/demo.xwar
+#test: JVM; /System/Library/Frameworks/JavaVM.framework/Versions/1.3.1/Commands/java -jar build/JVM/xwt.jar http://localhost/demo.xwar
+test: JVM; java -jar build/JVM/xwt.jar http://localhost/demo.xwar
 
 oldcompile: preprocess; CLASSPATH=$$CLASSPATH:lib/libgcj-minimal.jar javac -d build/class `find build/java/ src/org/xwt/mips -name \*.java`