X-Git-Url: http://git.megacz.com/?p=org.ibex.core.git;a=blobdiff_plain;f=Makefile;h=862e1f34c890b5b35b5a270e79c50e49f20f0fb7;hp=203cdd096c5e7c50ff0298c2ef473325eb49ae66;hb=6f6a7fea7232c364a46839b5a189bcc53a8b2865;hpb=09668db2738ece16b41452508c770bf1052dbf00

diff --git a/Makefile b/Makefile
index 203cdd0..862e1f3 100644
--- a/Makefile
+++ b/Makefile
@@ -3,28 +3,30 @@
 # The XWT Makefile
 #
 
-all:                   JVM Linux Win32 Java2 #Solaris
-.SILENT: $(cc_objects) $(java_objects) $(java_headers) all build/xwar/builtin.xwar $(target_bin) compile
+all:      JVM Linux Win32 Carbon Java2 #Solaris
+
+JVM:        build/JVM/xwt.jar
+Linux:    ; make gcj platform=Linux target=i686-pc-linux-gnu platform_link="-lX11 -lXext --static"
+Solaris:  ; make gcj platform=Solaris target=sparc-sun-solaris2.7 platform_link="-lX11 -lXext"
+Win32:    ; make gcj platform=Win32 target=i686-pc-mingw32 target_bin=xwt.exe platform_link="-Wl,--subsystem,windows -lcomdlg32"
+Carbon:   ; make gcj platform=Carbon target=powerpc-apple-darwin \
+		      platform_link=-Wl,-framework,Carbon,-framework,OpenGL,-framework,AGL,-framework,SystemConfiguration
 
 
 #############################################################################
 # Configurables:
 #
-target_bin             := xwt.$(shell echo $(target) | tr A-Z a-z)
-jikes_flags            := -verbose -nowarn -sourcepath src/
+target_bin             := xwt.$(shell echo $(platform) | tr A-Z a-z)
+jikes_flags            := -nowarn -sourcepath src/
 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)
-gcj_flags              := -fCLASSPATH=src
+#gcc_optimizations      := -O9 -ffast-math -fomit-frame-pointer -foptimize-sibling-calls
+#gcc_optimizations      += -finline-functions -funroll-loops -ffunction-sections -fdata-sections
+gcc_flags              := $(gcc_optimizations) -Ibuild/h -Iupstream/jpeg-6b/src/
+gcj_flags              += -fCLASSPATH=build/java
 gcj                    := $(gcc_path)/bin/$(target)-gcj $(gcc_flags) $(gcj_flags)
 g++                    := $(gcc_path)/bin/$(target)-g++ $(gcc_flags)
 gcc                    := $(gcc_path)/bin/$(target)-gcc $(gcc_flags)
-gcjh                   := $(gcc_path)/bin/$(target)-gcjh
-as                     := $(gcc_path)/$(target)/bin/as
-ar                     := $(gcc_path)/$(target)/bin/ar
-ranlib                 := $(gcc_path)/$(target)/bin/ranlib
-strip                  := $(gcc_path)/$(target)/bin/strip
 jar                    := $(shell ((type fastjar &>/dev/null) && echo fastjar) || echo jar)
 
 
@@ -39,134 +41,131 @@ jar                    := $(shell ((type fastjar &>/dev/null) && echo fastjar) |
 # phase in any order.
 #
 
-
-# PHASE 1a: human-written inputs
-handwritten_java_sources      := $(find src -name \*.java)
-handwritten_java_pp_sources   := $(find src -name \*.java.pp)
-handwritten_mips_sources      := $(find src -name \*.mips.c)
-handwritten_cc_sources        := src/org/xwt/plat/$(platform).cc
-handwritten_c_sources         := $(jpeg_c_sources:%.c=src/org/ijg/%.c)
-handwritten_xwar_sources      := $(shell ls src/org/xwt/builtin/*.png src/org/xwt/builtin/*.xwt src/org/xwt/builtin/*.xwf)
-
-
-# PHASE 1b: upstream code
+# PHASE 1a: upstream code and how to fetch it
+include Makefile.upstream
 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/src/%.c)
-$(jpeg_sources):
-	make -C upstream jpeg-6b/.installed
 
-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 -C upstream freetype-2.1.4/.installed
+upstream/jpeg-6b/src/%.c: download_jpeg-6b
 
-upstream/.jikes:
-	make -C upstream .jikes
-
-$(gcc_path)/bin/$(target)-gcj:
-	make -C upstream gcc-3.3-$(target)
+freetype_sources    := ftsystem.c ftmm.c ftbbox.c ftinit.c ftdebug.c ftbase.c ftglyph.c smooth.c sfnt.c truetype.c
+upstream/freetype-2.1.4/%.c: download_freetype-2.1.4
 
+# PHASE 1b: human-written inputs
+java_sources      := $(patsubst src/%.java,    build/java/%.java, $(shell find src -name \*.java))
+java_sources      += $(patsubst src/%.java.pp, build/java/%.java, $(shell find src -name \*.java.pp))
+java_sources      += $(patsubst src/%.mips.c,  build/java/%.java, $(shell find src -name \*.mips.c))
+java_sources      += build/java/org/xwt/Builtin.java
 
 # PHASE 2: ready-to-compile java files (either symlinked to phase 1a sources or else generated from them)
-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
-	mkdir -p `dirname $@`;                  \
-	cd `dirname $@`;                        \
-	A=`echo $@ | sed 's_[^/]*/_../_g'`;     \
-	B=`dirname $$A`;                        \
-	C=$$B/$<;                               \
-	ln -s $$C	
-
+build/java/%.java: src/%.java ; @echo linking $@; mkdir -p $(@D); ln -s `echo $(@D) | sed 's_[^/]*\(/\|$$\)_../_g'`/$< $@
+build/cc/%.cc:     src/%.c    ; @echo linking $@; mkdir -p $(@D); ln -s `echo $(@D) | sed 's_[^/]*\(/\|$$\)_../_g'`/$< $@
+build/c/jpeg/%.c:     upstream/jpeg-6b/src/%.c
+	@echo linking $@; mkdir -p $(@D); ln -s `echo $(@D) | sed 's_[^/]*\(/\|$$\)_../_g'`/$< $@
+build/c/freetype/%.c: upstream/freetype-2.1.4/src/base/%.c
+	@echo linking $@; mkdir -p $(@D); ln -s `echo $(@D) | sed 's_[^/]*\(/\|$$\)_../_g'`/$< $@
+build/c/freetype/%.c: upstream/freetype-2.1.4/src/%/%.c
+	@echo linking $@; mkdir -p $(@D); ln -s `echo $(@D) | sed 's_[^/]*\(/\|$$\)_../_g'`/$< $@
+
+build/java/%.java: src/%.java.pp build/class/org/xwt/util/Preprocessor.class
+	@echo -e "\n\033[1mpreprocessing   .java.pp -> .java:  $<\033[0m"
+	mkdir -p `dirname $@`
+	rm -f $@
+	java -cp build/class org.xwt.util.Preprocessor < $< > $@
 
 # 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/org/xwt/imp/MIPS.class
-$(class_files): build/class/%.class: build/java/%.java src/%.java upstream/.jikes
-	@$(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/_"
-
+build/class/%.class: build/java/%.java .jikes
+	@echo -e "\n\033[1mcompiling          .java -> .class: $<\033[0m"
+	mkdir -p build/class
+	@./.jikes $<
+
+compile: .compile
+.compile: $(java_sources)
+	@echo -e "\n\033[1mcompiling          .java -> .class: src/**/*.java\033[0m"
+	mkdir -p build/class
+	@./.jikes $(java_sources)
+	touch .compile
 
 # PHASE 4: gcj-generated headers
-java_headers          := $(build_java_sources:build/java/%.java=build/h/%.h)
-$(java_headers): build/h/%.h: build/%.class
-	@echo "extracting        .class -> .h:     $<"
-	cd build; find `echo $< | sed s/.class$$// | sed s_^build/__ `*.class |\
-		sed s_/_._g | sed s/.class$$// | sed s/.java$$// |\
-			xargs $(gcjh) --classpath .
+java_headers          := $(java_sources:build/java/%.java=build/h/%.h)
+build/h/%.h: build/class/%.class .compile
+	@echo -e "\n\033[1mextracting        .class -> .h:     $<\033[0m"
+	mkdir -p `dirname $@`
+	ls `echo $< | sed s/.class\$$//`*.class |\
+		 sed s_build/class/__ | sed s/.class\$$//g | sed s_/_._g | (cd build/class; xargs ../../$(gcc_path)/bin/gcjh -d ../h --classpath .)
 
 # PHASE 4: object files
-java_object_files          := $(filter-out build/$(platform)/org/xwt/plat/%, $(java_sources:src/%.java=build/$(platform)/%.java.o))
-java_object_files          += $(pathsubst %,build/$(platform)/org/xwt/plat/%.java.o,GCJ $(platform_java_sources))
-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
-	@echo "compiling          .java -> .o:     $<"
+build/$(platform)/%.java.o: build/java/%.java
+	@echo -e "\n\033[1mcompiling          .java -> .o:     $<\033[0m"
 	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:     $<"
-	@mkdir -p `dirname $@`
+
+build/$(platform)/org/xwt/plat/$(platform).cc.o: src/org/xwt/plat/*.cc $(java_headers)
+	@echo -e "\n\033[1mcompiling            .cc -> .o:     $<\033[0m"
+	mkdir -p `dirname $@`
 	$(g++) -I/usr/X11R6/include/ -I$(gcc_path)/include -Ibuild/h -Iupstream/$(platform)/include -Wno-multichar -c $< -o $@
-$(c_object_files): build/$(platform)/%.c.o: src/%.c src/org/ijg/jmorecfg.h
-	@echo "compiling             .c -> .o:     $<"
-	@mkdir -p `dirname $@`
+
+build/$(platform)/jpeg-6b/%.c.o: upstream/jpeg-6b/src/%.c
+	@echo -e "\n\033[1mcompiling             .c -> .o:     $<\033[0m"
+	mkdir -p `dirname $@`
 	$(gcc) -Ibuild/h -c $< -o $@
 
 # PHASE 5: linking
-$(target_bin): $(objects)
-	@echo "linking               .o -> $(target_bin)"
-	$(gcj) --main=org.xwt.Main -o build/$(platform)/$(target_bin) $^ $(platform_link) 
+$(target_bin).ar: $(java_object_files) build/$(platform)/org/xwt/plat/$(platform).cc.o $(jpeg_object_files)
+	@echo -e "\n\033[1marchiving             .o -> $(target_bin).ar\033[0m"
+	rm -f $(target_bin).ar
+	$(ar) -c $(target_bin).ar $^
+
+$(target_bin): $(target_bin).ar
+	@echo -e "\n\033[1mlinking               .o -> $(target_bin)\033[0m"
+	mkdir -p build/$(platform)
+	$(gcj) --main=org.xwt.Main -o build/$(platform)/$(target_bin) $(target_bin).ar -L$(gcc_path)/lib $(platform_link) 
 
 
 ##############################################################################
 # Special treatment:
 #
 
-build/java/org/xwt/Builtin.java: $(handwritten_xwar_sources) mkdirs
-	@mkdir -p `dirname $@`
-	@echo "wrapping           .xwar -> .o:      build/java/org/xwt/Builtin.java"
+build/java/org/xwt/Builtin.java:: $(shell ls src/org/xwt/builtin/*.png src/org/xwt/builtin/*.xwt src/org/xwt/builtin/*.xwf)
+	@mkdir -p `dirname $@` build build/java build/class build/h build
+	echo -e "\n\033[1mzipping/uuencoding  .xwt -> .java:  build/java/org/xwt/Builtin.java\033[0m"
 	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/%=%) | \
+	cd src; $(jar) cf - $(<: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/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
+	@echo -e "\n\033[1mtranslating        .mips -> .java:  $@\033[0m"
+	mkdir -p build/java/org/xwt/imp/
+	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/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/%.o: src/org/xwt/imp/%.c $(gcc_path)/bin/mips-gcc upstream/.freetype
+	@mkdir -p build/mips
+	echo -e "\n\033[1mcompiling $< -> $@ (mips)\033[0m"
+	$(gcc_path)/bin/mips-gcc \
+		-march=mips1 \
+		-I upstream/freetype-2.1.4/include \
+		-c -o $@ $<
 
-build/mips/freetype.mips:
+build/mips/freetype.mips: $(gcc_path)/bin/mips-gcc build/mips/crt0.o build/mips/syscalls.o build/mips/Freetype.o  upstream/.freetype-mips
+	@echo -e "\n\033[1mcompiling             .c -> .mips:  $@\033[0m"
 	mkdir -p build/mips
-	make -C 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
+	make -sC upstream newlib-1.11.0/src newlib-1.11.0/build-mips/.installed freetype-2.1.4/src target=mips
 	$(gcc_path)/bin/mips-gcc \
+		-nostdlib \
 		--static \
-		-mabi=32 \
-		-mips1 \
-		-msoft-float \
+		-march=mips1 \
+		-T src/org/xwt/imp/linker.ld \
+		-Lbuild/mips \
+		-Lupstream/freetype-2.1.4/objs \
 		-o $@ \
-		-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
-
+		build/mips/Freetype.o \
+		-lfreetype
 
 
 ##############################################################################
@@ -176,43 +175,17 @@ build/mips/freetype.mips:
 # 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) ========================================="
-
-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"
-
-Solaris:
-	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
-
-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
-	echo -e "\\n=== JVM ========================================="
-	echo "archiving         .class -> .jar"
+build/JVM/xwt.jar:.compile
+	@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" > bin/.manifest
-	cd build; $(jar) cvfm ../xwt.jar .manifest \
+	echo -e "Manifest-Version: 1.0\nMain-Class: org.xwt.Main\n" > build/JVM/.manifest
+	cd build/class; $(jar) cfm ../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
+		org/xwt/plat/AWT*.class org/xwt/plat/Java2*.class
 	echo
 
 
 
-##############################################################################
-# Misc
-#
-
-mkdirs:
-	mkdir -p build build/java build/class build/h build
-clean:
-	find . -name \*~ | xargs rm -f
-	find . -name \#\*\# | xargs rm -f
-
-
 
 ##############################################################################
 # Maintainer stuff: generating numbered builds, proposing patches
@@ -311,13 +284,6 @@ dist-private:
 	echo "*** DONE ******************************************"
 
 
-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 | \
-		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