X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=b984de7a226ca26be56fcd75fd44f7a2dcc3bfdd;hb=1c20383eb478d9f2f1a7936b278330a9df3967ee;hp=fb09e67877a09703ec27f6d6cf3be35c44307e8c;hpb=94cf093f6318ccd0ef8b6e5a198f55e9165d0316;p=org.ibex.core.git

diff --git a/Makefile b/Makefile
index fb09e67..b984de7 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@
 # The XWT Makefile
 #
 
-all:                   Linux Win32 Java2 #Solaris
+all:                   JVM Linux Win32 Java2 #Solaris
 .SILENT: $(cc_objects) $(java_objects) $(java_headers) all build/xwar/builtin.xwar $(target_bin) compile
 
 
@@ -12,7 +12,7 @@ all:                   Linux Win32 Java2 #Solaris
 #
 target_bin             := xwt.$(shell echo $(target) | tr A-Z a-z)
 jikes_flags            := -verbose -nowarn -sourcepath src/
-gcc_path               := upstream/prefix
+gcc_path               := upstream/install
 gcc_optimizations      := -O2
 #gcc_optimizations      := -O9 -ffast-math -fomit-frame-pointer -foptimize-sibling-calls -finline-functions -funroll-loops -ffunction-sections -fdata-sections
 gcc_flags              := $(gcc_optimizations)
@@ -53,20 +53,20 @@ handwritten_xwar_sources      := $(shell ls src/org/xwt/builtin/*.png src/org/xw
 jpeg_c_sources    := jdapimin.c jdapistd.c jcomapi.c jcparam.c jdmaster.c jdinput.c jdmainct.c jdcoefct.c jdpostct.c jdmarker.c
 jpeg_c_sources    += jdhuff.c jdphuff.c jddctmgr.c jidctint.c jidctfst.c jidctflt.c jidctred.c jdsample.c jdcolor.c jdmerge.c
 jpeg_c_sources    += jquant1.c jquant2.c jerror.c jutils.c jmemnobs.c jmemmgr.c
-jpeg_sources      := $(jpeg_c_sources:%.c=upstream/jpeg-6b/%.c)
+jpeg_sources      := $(jpeg_c_sources:%.c=upstream/jpeg-6b/src/%.c)
 $(jpeg_sources):
-	make -C upstream .jpeg-6b
+	make -sC upstream jpeg-6b/.installed
 
-freetype_sources    := $(patsubst %,upstream/freetype-2.1.4/base/%,ftsystem.c ftmm.c ftbbox.c ftinit.c ftdebug.c ftbase.c ftglyph.c)
-freetype_sources    += $(patsubst %,upstream/freetype-2.1.4/%,smooth/smooth.c autohint/autohint.c sfnt/sfnt.c truetype/truetype.c)
-$(freetype_sources): upstream/.freetype-2.1.4a
-	make -C upstream .freetype-2.1.4
+freetype_sources    := $(patsubst %,upstream/freetype-2.1.4/src/src/base/%,ftsystem.c ftmm.c ftbbox.c ftinit.c ftdebug.c ftbase.c ftglyph.c)
+freetype_sources    += $(patsubst %,upstream/freetype-2.1.4/src/src/%,smooth/smooth.c autohint/autohint.c sfnt/sfnt.c truetype/truetype.c)
+$(freetype_sources):
+	make -sC upstream freetype-2.1.4/.installed
 
 upstream/.jikes:
-	make -C upstream .jikes
+	make -sC upstream .jikes
 
 $(gcc_path)/bin/$(target)-gcj:
-	make -C upstream .gcc-$(target)
+	make -sC upstream gcc-3.3-$(target)
 
 
 # PHASE 2: ready-to-compile java files (either symlinked to phase 1a sources or else generated from them)
@@ -74,7 +74,8 @@ java_sources    := $(handwritten_java_sources:src/%.java=build/java/%.java)
 java_sources    += $(handwritten_java_pp_sources:src/%.java.pp=build/java/%.java)
 java_sources    += $(handwritten_mips_sources:src/%.mips.c=build/java/%.java)
 java_sources    += build/java/org/xwt/Builtin.java
-build/java/%.java: src/%.java
+build/java/%.java:: src/%.java
+	@mkdir -p `dirname $@`;                  \
 	cd `dirname $@`;                        \
 	A=`echo $@ | sed 's_[^/]*/_../_g'`;     \
 	B=`dirname $$A`;                        \
@@ -84,10 +85,10 @@ build/java/%.java: src/%.java
 
 # PHASE 3: class files
 class_files           := $(java_sources:build/java/%.java=build/class/%.class)
-class_files           += build/class/org/xwt/imp/Freetype.class
-build/%.class: build/java/%.java src/%.java upstream/.jikes mkdir_build
-	@$(shell cat upstream/.jikes) -classpath lib/libgcj-minimal.jar $< -d build/ 2>&1 | \
-		grep -v ^\\[read | sed s_^\\[write\ build/__ | sed s_.class\\]_.java_ | sed "s_^_compiling          .java -> .class: src/_"
+class_files           += build/class/org/xwt/imp/Freetype.class build/class/org/xwt/imp/MIPS.class
+$(class_files): build/class/%.class: build/java/%.java upstream/.jikes
+	@$(shell cat upstream/.jikes) -classpath lib/libgcj-minimal.jar $< -d build/class/ 2>&1 | \
+		grep -v ^\\[read | sed s_^\\[write\ build/class/__ | sed s_.class\\]_.java_ | sed "s_^_compiling          .java -> .class: src/_"
 
 
 # PHASE 4: gcj-generated headers
@@ -104,9 +105,9 @@ java_object_files          += $(pathsubst %,build/$(platform)/org/xwt/plat/%.jav
 java_object_files          += build/$(platform)/org/xwt/imp/Freetype.java.o
 cc_object_files            := $(handwritten_cc_sources:src/%.cc=build/$(platform)/%.cc.o)
 c_object_files             := $(handwritten_c_sources:src/%.c=build/$(platform)/%.c.o)
-$(java_objects): build/$(platform)/%.java.o: src/%.java
+$(java_objects): build/$(platform)/%.java.o: build/java/%.java
 	@echo "compiling          .java -> .o:     $<"
-	mkdir -p `dirname $@`
+	@mkdir -p `dirname $@`
 	$(gcj) -c $< -o $@
 $(cc_object_files): build/$(platform)/%.cc.o: src/%.cc $(java_headers) src/org/ijg/jmorecfg.h
 	@echo "compiling            .cc -> .o:     $<"
@@ -127,38 +128,46 @@ $(target_bin): $(objects)
 # Special treatment:
 #
 
-build/java/org/xwt/Builtin.java: $(handwritten_xwar_sources) mkdir_build
-	@echo "wrapping           .xwar -> .o:     build/java/org/xwt/Builtin.java"
-	echo "package org.xwt;"                 >  build/java/org/xwt/Builtin.java
-	echo "class Builtin {"                  >> build/java/org/xwt/Builtin.java
-	echo "public static String encoded = "  >> build/java/org/xwt/Builtin.java
-	cd src; $(jar) cf - $(xwar_sources:src/%=%) | uuencode foo | tail -n +2 | grep -v '^end$$' | grep -v '^`$$' | sed 's_(.+)_"\1" +_' >> ../build/java/org/xwt/Builtin.java
-	echo "\"\"; }                           >> build/java/org/xwt/Builtin.java
+build/java/org/xwt/Builtin.java: $(handwritten_xwar_sources)
+	@mkdir -p `dirname $@` build build/java build/class build/h build
+	@echo "zipping/uuencoding  .xwt -> .java:  build/java/org/xwt/Builtin.java"
+	@echo "package org.xwt;"                  >  build/java/org/xwt/Builtin.java
+	@echo "class Builtin {"                   >> build/java/org/xwt/Builtin.java
+	@echo "public static String encoded = "   >> build/java/org/xwt/Builtin.java
+	@cd src; $(jar) cf - $(handwritten_xwar_sources:src/%=%) | \
+		uuencode foo | tail -n +2 | grep -v '^end$$' | grep -v '^`$$' | \
+		sed 's_\(.+\)_"\1" +_' >> ../build/java/org/xwt/Builtin.java
+	@echo "\"\"; }"                           >> build/java/org/xwt/Builtin.java
 
 postprocessed_sources   := $(handwritten_java_pp_sources:src/%.pp=build/java/%)
-$(postprocessed_sources):  build/java/%.java: src/%.java.pp build/org/xwt/util/Preprocessor.class
+$(postprocessed_sources):  build/java/%.java: src/%.java.pp build/class/org/xwt/util/Preprocessor.class
 	@echo "preprocessing   .java.pp -> .java:  $<"
 	@mkdir -p `dirname $@`
 	@java -cp build org.xwt.util.Preprocessor < $< > $@
 
-build/java/org/xwt/imp/Freetype.java: build/mips/freetype.mips build/class/org/xwt/imp/MIPS.class
+build/java/org/xwt/imp/Freetype.java:: build/mips/freetype.mips build/class/org/xwt/imp/MIPS.class
 	@echo "translating        .mips -> .java:  $<"
 	@mkdir -p build/java/org/xwt/imp/
-	@java -cp build org.xwt.imp.MIPS org.xwt.imp.Freetype build/mips/freetype.mips > build/java/org/xwt/imp/Freetype.java
-
-build/mips/freetype.mips: upstream/.freetype
-	make -C upstream .gcc-mips target=mips
-	$(gcc_path)/bin/mips-gcc \
+	@rm -f $@
+	@java -cp build/class org.xwt.imp.MIPS org.xwt.imp.Freetype build/mips/freetype.mips > build/java/org/xwt/imp/Freetype.java
+
+build/mips/freetype.mips: $(freetype_mips_objects)
+	@echo "compiling             .c -> .mips:  $<"
+	@mkdir -p build/mips
+	@make -sC upstream newlib-1.11.0/src newlib-1.11.0/build-mips/.installed gcc-3.3-mips freetype-2.1.4/src .headers target=mips
+	@$(gcc_path)/bin/mips-gcc \
 		--static \
 		-mabi=32 \
 		-mips1 \
 		-msoft-float \
 		-o $@ \
-		-I gcc/src/freetype-2.1.4/include \
+		-I upstream/freetype-2.1.4/src/include \
 		$(freetype_sources) \
+		-mno-crt0 \
+		-Tnullmon.ld \
 		-Wl,--warn-once \
 		src/org/xwt/imp/Freetype.c \
-		-Wl,-s,-T,$(gcc_path)/mips/lib/nullmon.ld
+		-Wl,-s
 
 
 
@@ -169,30 +178,29 @@ build/mips/freetype.mips: upstream/.freetype
 # 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: $(gcc_path)/bin/$(target)-gcj compile $(target_bin)
-	echo -e "\\n=== $(target) ========================================="
+	@echo -e "\\n=== $(target) ========================================="
 
 Linux:
-	make gcj platform=Linux target=i686-pc-linux-gnu platform_link="-L$(gcc_path)/lib -L/usr/X11R6/lib -lX11 -lXext --static" platform_java_sources="POSIX X11"
+	@make gcj platform=Linux target=i686-pc-linux-gnu platform_link="-L$(gcc_path)/lib -L/usr/X11R6/lib -lX11 -lXext --static" platform_java_sources="POSIX X11"
 
 Solaris:
-	make gcj platform=Solaris target=sparc-sun-solaris2.7 platform_link="-L$(gcc_path)/lib -lX11 -lXext" platform_java_sources="POSIX X11"
+	@make gcj platform=Solaris target=sparc-sun-solaris2.7 platform_link="-L$(gcc_path)/lib -lX11 -lXext" platform_java_sources="POSIX X11"
 
 Win32:
-	make gcj platform=Win32 target=i686-pc-mingw32 target_bin=xwt.exe platform_link="-Wl,--subsystem,windows -lcomdlg32" platform_java_sources=Win32
+	@make gcj platform=Win32 target=i686-pc-mingw32 target_bin=xwt.exe platform_link="-Wl,--subsystem,windows -lcomdlg32" platform_java_sources=Win32
 
 Carbon:
-	make gcj platform=Carbon arget=powerpc-apple-darwin platform_link="$(gcc_path)/lib/libgcj.a -Xlinker -framework -Xlinker Carbon" platform_java_sources="POSIX Carbon"
-
-JVM: compile build/xwar/builtin.xwar
-	echo -e "\\n=== JVM ========================================="
-	echo "archiving         .class -> .jar"
-	mkdir -p build/JVM
-	echo -e "Manifest-Version: 1.0\nMain-Class: org.xwt.Main\n" > bin/.manifest
-	cd build; $(jar) cvfm ../xwt.jar .manifest \
-                org/xwt/builtin.xwar \
+	@make gcj platform=Carbon arget=powerpc-apple-darwin platform_link="$(gcc_path)/lib/libgcj.a -Xlinker -framework -Xlinker Carbon" platform_java_sources="POSIX Carbon"
+
+JVM: compile $(class_files)
+	@echo -e "\\n=== JVM ========================================="
+	@echo "archiving         .class -> .jar"
+	@mkdir -p build/JVM
+	@echo -e "Manifest-Version: 1.0\nMain-Class: org.xwt.Main\n" > build/JVM/.manifest
+	@cd build/class; $(jar) cvfm ../JVM/xwt.jar ../JVM/.manifest \
 		`find . -name \*.class | grep -v org/xwt/plat/` \
 		org/xwt/plat/AWT*.class org/xwt/plat/Java2*.class | tr \\012 \\015
-	echo
+	@echo
 
 
 
@@ -200,8 +208,6 @@ JVM: compile build/xwar/builtin.xwar
 # Misc
 #
 
-mkdirs:
-	mkdir -p build build/java build/class build/h build
 clean:
 	find . -name \*~ | xargs rm -f
 	find . -name \#\*\# | xargs rm -f
@@ -305,13 +311,13 @@ dist-private:
 	echo "*** DONE ******************************************"
 
 
-compile: .javac $(java_sources) build/xwar/builtin.xwar build/org/xwt/imp/Freetype.class
+compile: upstream/.jikes $(java_sources) build/class/org/xwt/imp/Freetype.class
 	echo "compiling          .java -> .class: src/**/*.java"
 	mkdir -p build
-	cp build/org/xwt/imp/MIPS.class build/org/xwt/imp/MIPS.class.old
-	$(shell cat .javac) -classpath lib/libgcj-minimal.jar $(java_sources) -d build/ 2>&1 | \
+	cp build/class/org/xwt/imp/MIPS.class build/class/org/xwt/imp/MIPS.class.old
+	$(shell cat upstream/.jikes) -classpath lib/libgcj-minimal.jar $(java_sources) -d build/ 2>&1 | \
 		grep -v ^\\[read | sed s_^\\[write\ build/__ | sed s_.class\\]_.java_ | sed "s_^_compiling          .java -> .class: src/_"
-	cmp build/org/xwt/imp/MIPS.class build/org/xwt/imp/MIPS.class.old && mv build/org/xwt/imp/MIPS.class.old build/org/xwt/imp/MIPS.class
+	cmp build/class/org/xwt/imp/MIPS.class build/class/org/xwt/imp/MIPS.class.old && mv build/class/org/xwt/imp/MIPS.class.old build/class/org/xwt/imp/MIPS.class