X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=bdc2c4e6b0505a53f7326a9296fb3716f8459601;hb=4fdc28480ee9cf85f346d2dc0bbbd5770e08b1a7;hp=444515b3c55c8230d1511fbad874f9e4d16c2dbd;hpb=ce833e3c1a159dd84cb5f7c3548248a09f63590a;p=org.ibex.core.git

diff --git a/Makefile b/Makefile
index 444515b..bdc2c4e 100644
--- a/Makefile
+++ b/Makefile
@@ -3,8 +3,14 @@
 # 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
 
 
 #############################################################################
@@ -14,18 +20,13 @@ target_bin             := xwt.$(shell echo $(platform) | tr A-Z a-z)
 jikes_flags            := -verbose -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) -Ibuild/h
+#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/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)
 
 
@@ -40,145 +41,131 @@ jar                    := $(shell ((type fastjar &>/dev/null) && echo fastjar) |
 # phase in any order.
 #
 
-
-# PHASE 1a: 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 -sC upstream jpeg-6b/src
-
-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 -sC upstream .jikes
-
-$(gcc_path)/bin/$(target)-gcj:
-	make -sC upstream gcc-3.3.1-$(target)
+upstream/jpeg-6b/src/%.c: download_jpeg-6b
 
+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
-handwritten_java_sources      := $(shell find src -name \*.java)
-handwritten_java_pp_sources   := $(shell find src -name \*.java.pp)
-handwritten_mips_sources      := $(shell find src -name \*.mips.c)
-handwritten_cc_sources        := src/org/xwt/plat/$(platform).cc
-handwritten_c_sources         := $(jpeg_sources)
-handwritten_xwar_sources      := $(shell ls src/org/xwt/builtin/*.png src/org/xwt/builtin/*.xwt src/org/xwt/builtin/*.xwf)
-
+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
-java_sources    += build/java/org/xwt/imp/Freetype.java
-$(handwritten_java_sources:src/%.java=build/java/%.java): build/java/%.java: src/%.java
-	@echo "symlinking:                         $@"
-	@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 "preprocessing   .java.pp -> .java:  $<"
+	@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/%.class: build/java/%.java upstream/.jikes
+build/class/%.class: build/java/%.java .jikes
 	@echo "compiling          .java -> .class: $<"
 	@mkdir -p build/class
-	@upstream/.jikes $<
+	@./.jikes $<
 
 compile: .compile
 .compile: $(java_sources)
 	@echo "compiling          .java -> .class: src/**/*.java"
 	@mkdir -p build/class
-	@upstream/.jikes $(java_sources)
+	@./.jikes $(java_sources)
 	@touch .compile
 
 # PHASE 4: gcj-generated headers
 java_headers          := $(java_sources:build/java/%.java=build/h/%.h)
-$(java_headers): build/h/%.h: build/class/%.class .compile
+build/h/%.h: build/class/%.class .compile
 	@echo "extracting        .class -> .h:     $<"
 	@mkdir -p `dirname $@`
 	@ls `echo $< | sed s/.class\$$//`*.class |\
-		 sed s_build/class/__ | sed s/.class\$$//g | sed s_/_._g | (cd build/class; xargs ../../$(gcjh) -d ../h --classpath .)
+		 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:build/java/%=build/$(platform)/%.o))
-java_object_files          += $(patsubst %,build/$(platform)/org/xwt/plat/%.java.o,GCJ $(platform_java_sources))
-cc_object_files            := $(handwritten_cc_sources:src/%.cc=build/$(platform)/%.cc.o)
-c_object_files             := $(handwritten_c_sources:upstream/jpeg-6b/src/%.c=build/$(platform)/jpeg-6b/%.c.o)
-$(java_object_files): build/$(platform)/%.java.o: build/java/%.java
+build/$(platform)/%.java.o: build/java/%.java
 	@echo "compiling          .java -> .o:     $<"
 	@mkdir -p `dirname $@`
 	@$(gcj) -c $< -o $@
-$(cc_object_files): build/$(platform)/%.cc.o: src/%.cc $(java_headers)
+
+build/$(platform)/org/xwt/plat/$(platform).cc.o: src/org/xwt/plat/*.cc $(java_headers)
 	@echo "compiling            .cc -> .o:     $<"
 	@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)/jpeg-6b/%.c.o: upstream/jpeg-6b/src/%.c
+
+build/$(platform)/jpeg-6b/%.c.o: upstream/jpeg-6b/src/%.c
 	@echo "compiling             .c -> .o:     $<"
 	@mkdir -p `dirname $@`
 	@$(gcc) -Ibuild/h -c $< -o $@
 
 # PHASE 5: linking
-$(target_bin): $(java_object_files) $(cc_object_files) $(c_object_files)
+$(target_bin).ar: $(java_object_files) build/$(platform)/org/xwt/plat/$(platform).cc.o $(jpeg_object_files)
+	@echo "archiving             .o -> $(target_bin).ar"
+	@rm -f $(target_bin).ar
+	@$(ar) -c $(target_bin).ar $^
+
+$(target_bin): $(target_bin).ar
 	@echo "linking               .o -> $(target_bin)"
 	@mkdir -p build/$(platform)
-	@$(gcj) --main=org.xwt.Main -o build/$(platform)/$(target_bin) $^ $(platform_link) 
+	@$(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)
+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 "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/%=%) | \
+	@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 $@`
-	@rm -f $@
-	@java -cp build/class org.xwt.util.Preprocessor < $< > $@
-
 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/
 	@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:  $@"
+build/mips/%.o: src/org/xwt/imp/%.c $(gcc_path)/bin/mips-gcc upstream/.freetype
 	@mkdir -p build/mips
-	@make -sC upstream newlib-1.11.0/src newlib-1.11.0/build-mips/.installed gcc-3.3.1-mips freetype-2.1.4/src .headers target=mips
+	@echo "compiling $< -> $@ (mips)"
 	@$(gcc_path)/bin/mips-gcc \
+		-march=mips1 \
+		-I upstream/freetype-2.1.4/include \
+		-c -o $@ $<
+
+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 "compiling             .c -> .mips:  $@"
+	@mkdir -p build/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
 
 
 ##############################################################################
@@ -188,21 +175,6 @@ build/mips/freetype.mips: $(freetype_mips_objects)
 # 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: build/JVM/xwt.jar
 build/JVM/xwt.jar:.compile
 	@echo "archiving         .class -> .jar:   build/JVM/xwt.jar"
 	@mkdir -p build/JVM