X-Git-Url: http://git.megacz.com/?p=org.ibex.core.git;a=blobdiff_plain;f=Makefile;h=cf6a3578ab6f5566a7b341157a1d1df37c11005c;hp=f0c9efee61c318ed45dbf24c311a42fd711cab21;hb=78cc1426c506aafe5fe79b333270efd9ecf4e575;hpb=2c91b5f1b920da9516892fdcaf345c586a71e259

diff --git a/Makefile b/Makefile
index f0c9efe..cf6a357 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 {} \;
 
@@ -47,16 +50,17 @@ include Makefile.upstream
 
 # figure out what stuff in org.xwt.plat.* this platform requires (its superclasses)
 java_sources      := $(patsubst src/%.java,     build/java/%.java, $(shell find src -name '*.java' \! -path 'src/org/xwt/mips/*'))
-java_sources      += build/java/org/xwt/translators/FreetypeVM.java
+java_sources      += build/java/org/xwt/translators/MIPSApps.java
 all_java_sources  := $(java_sources)
 
 nonplat_java_sources      := $(filter-out build/java/org/xwt/plat/%, $(java_sources))
 plat_java_sources         := $(filter build/java/org/xwt/plat/%, $(java_sources))
 
-build/java/org/xwt/translators/FreetypeVM.java: build/res/freetype.mips build/class/org/xwt/mips/Compiler.class
+build/java/org/xwt/translators/MIPSApps.java: build/mips/mipsapps.mips build/class/org/xwt/mips/Compiler.class
 	mkdir -p build/java/org/xwt/translators
+	@echo -e "\n\033[1mtranslating        .mips -> .java:  $<\033[0m"
 	(echo -e 'package org.xwt.translators;\nimport org.xwt.mips.*;\n'; \
-	 java -Xint -cp build/class org.xwt.mips.Compiler FreetypeVM build/res/freetype.mips)\
+	 java -Xint -cp build/class org.xwt.mips.Compiler MIPSApps build/mips/mipsapps.mips)\
 	 > $@
 
 build/java/org/xwt/%.java: src/org/xwt/%.java
@@ -71,6 +75,11 @@ build/c/jpeg/%.c:     upstream/jpeg-6b/src/%.c
 	@echo linking $@; mkdir -p $(@D); ln -fs `echo $(@D)/ | sed 's_[^/]*//*_../_g'`/$< $@
 build/res/%:       src/%      ; @echo linking $@; mkdir -p $(@D); ln -fs `echo $(@D)/ | sed 's_[^/]*//*_../_g'`/$< $@
 
+build/java/org/xwt/translators/MIPSApps.class: build/java/org/xwt/translators/MIPSApps.java .jikes
+	@echo -e "\n\033[1mcompiling          .java -> .class: $<\033[0m"
+	mkdir -p build/class/org/xwt/util/
+	./.jikes -g:none $<
+
 build/class/org/xwt/util/Preprocessor.class: src/org/xwt/util/Preprocessor.java .jikes
 	@echo -e "\n\033[1mcompiling          .java -> .class: $<\033[0m"
 	mkdir -p build/class/org/xwt/util/
@@ -156,7 +165,7 @@ build/res/fonts/vera: .download_vera-1.10
 	cd build/res/fonts/vera; ln -s ../../../../upstream/vera-1.10/ttf-bitstream-vera-1.10/Vera.ttf
 	cd build/res/fonts/vera; ln -s ../../../../upstream/vera-1.10/ttf-bitstream-vera-1.10/VeraMono.ttf
 	cd build/res/fonts/vera; ln -s ../../../../upstream/vera-1.10/ttf-bitstream-vera-1.10/VeraSe.ttf
-build/res/builtin.jar: $(builtin_src:src/%=build/res/%) build/res/freetype.mips build/res/libmspack.mips build/res/fonts/vera
+build/res/builtin.jar: $(builtin_src:src/%=build/res/%) build/res/fonts/vera
 	@echo -e "\n\033[1mzipping            res/* -> .jar: builtin.jar\033[0m"
 	cd build/res; $(jar) cf builtin.jar $(^:build/res/%=%)
 
@@ -187,7 +196,7 @@ build/JVM/xwt.jar: .compile build/res/builtin.jar
 # Freetype
 #
 
-build/mips/%.c.o: src/%.c
+build/mips/%.c.o: .download_libmspack-20030726 src/%.c
 	make .install_freetype-2.1.4_mips-unknown-elf target=mips-unknown-elf
 	mkdir -p $(@D)
 	echo -e "\n\033[1mcompiling $< -> $@ (mips)\033[0m"
@@ -196,8 +205,9 @@ build/mips/%.c.o: src/%.c
 		-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
+build/mips/mipsapps.mips: build/mips/org/xwt/translators/Freetype.c.o build/mips/org/xwt/translators/MSPack.c.o build/mips/org/xwt/translators/main.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
+	make .install_libmspack-20030726_mips-unknown-elf target=mips-unknown-elf
 	@echo -e "\n\033[1mlinking               .o -> .mips:  $@\033[0m"
 	mkdir -p build/mips build/res
 	upstream/install/bin/mips-unknown-elf-gcc \
@@ -207,26 +217,10 @@ build/res/freetype.mips: build/mips/org/xwt/translators/Freetype.c.o build/mips/
 		-T src/org/xwt/mips/linker.ld \
 		-Lbuild/mips \
 		-Lupstream/freetype-2.1.4/src/objs \
+		-Lupstream//libmspack-20030726/build-mips-unknown-elf/ \
 		-o $@ \
 		$^ \
-		-lfreetype
-
-.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"
-	mkdir -p build/mips build/res
-	upstream/install/bin/mips-unknown-elf-gcc \
-		-nostdlib \
-		--static \
-		-march=mips1 \
-		-T src/org/xwt/mips/linker.ld \
-		-Lbuild/mips \
-		-Lupstream/libmspack-20030726/src/mspack \
-		-Lupstream/libmspack-20030726/build-mips-unknown-elf \
-		-o $@ \
-		$^ \
+		-lfreetype \
 		-lmspack