X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=27286c93e0ad08c4189d69fce3a82c16309dae57;hb=0875e1f0271b4d43c84e61384b1959902e9516ba;hp=ae99cf4a2027b9e60ed6445f4f649ff6cfd1d2f2;hpb=067fcf0556752492c6396bc01dff0bf266199651;p=org.ibex.core.git

diff --git a/Makefile b/Makefile
index ae99cf4..27286c9 100644
--- a/Makefile
+++ b/Makefile
@@ -4,11 +4,11 @@
 
 #
 
-all:      JVM Linux Win32 Darwin Solaris
+all:      JVM Linux Win32 Darwin #Solaris
 
 clean:
-	rm -rf .jikes .configure* .install* build .compile
-	find upstream -name config.cache -exec rm {}\;
+	rm -rf .jikes .configure* .install* build .compile .build*
+	find upstream -name config.cache -exec rm {} \;
 
 JVM:        build/JVM/xwt.jar
 Linux:    ; make gcj platform=Linux   target=i686-pc-linux-gnu    link_flags="-lX11 -lXext"
@@ -140,7 +140,10 @@ $(target_bin): build/$(platform)/org/xwt/plat/$(platform).cc.o upstream/jpeg-6b/
 #
 
 builtin_src := $(shell find src/org/xwt/builtin -name '*.*')
-build/res/builtin.jar: $(builtin_src:src/%=build/res/%) build/res/freetype.mips build/res/libmspack.mips
+build/res/fonts/vera: .download_vera-1.10
+	mkdir -p build/res/fonts/vera
+	cd build/res/fonts/vera; ln -s ../../../../upstream/vera-1.10/ttf-bitstream-vera-1.10/Vera.ttf
+build/res/builtin.jar: $(builtin_src:src/%=build/res/%) build/res/freetype.mips build/res/libmspack.mips build/res/fonts/vera
 	@echo -e "\n\033[1mzipping            res/* -> .jar: builtin.jar\033[0m"
 	cd build/res; $(jar) cf builtin.jar $(^:build/res/%=%)
 
@@ -156,7 +159,7 @@ build/$(platform)/builtin.o: build/res/builtin.jar
 
 # compile is here to force compilation of the .class files (they get used via -Ibuild) without
 # 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)
+gcj: .vendor .compile .install_gcc-3.3_$(target) $(target_bin)
 
 build/JVM/xwt.jar: .compile build/res/builtin.jar
 	@echo -e "\n\033[1marchiving         .class -> .jar:   build/JVM/xwt.jar\033[0m"
@@ -262,7 +265,7 @@ dist: compile
 	echo "*  This build is $(current_build)"
 	echo "***********************************************************"
 
-        ifeq ($(shell uname -n),serverbeach.megacz.com)
+        ifeq ($(shell uname -n),megacz.com)
 		(make $(silent) dist-private 2>&1) >> .make-dist.out || \
 			(tail -n 200 .make-dist.out | mail -s "Build $(current_build) FAILED" cvs@xwt.org; false)
 		tail -n 200 .make-dist.out | \
@@ -311,3 +314,9 @@ dist-private:
 
 	echo
 	echo "*** DONE ******************************************"
+
+
+# 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 .
+
+