2003/09/07 01:58:44

darcs-hash:20040130070452-2ba56-adcf39813acd0abb8af467e3ac04e87aa079e111.gz

diff --git a/Makefile b/Makefile
index 862e1f3..546f447 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -6,11 +6,10 @@
 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
+Linux:    ; make gcj platform=Linux   target=i686-pc-linux-gnu    link_flags="-lX11 -lXext --static"
+Solaris:  ; make gcj platform=Solaris target=sparc-sun-solaris2.7 link_flags="-lX11 -lXext"
+Win32:    ; make gcj platform=Win32   target=i686-pc-mingw32      link_flags="-Wl,--subsystem,windows -lcomdlg32" target_bin=xwt.exe
+Darwin:   ; make gcj platform=Darwin  target=powerpc-apple-darwin link_flags=-Wl,-framework,Carbon,-framework,OpenGL,-framework,AGL,-framework,SystemConfiguration
 
 
 #############################################################################
@@ -18,30 +17,18 @@ Carbon:   ; make gcj platform=Carbon target=powerpc-apple-darwin \
 #
 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
 #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)
+gcj_flags              := -fCLASSPATH=build/java
+gcj                    := upstream/install/bin/$(target)-gcj $(gcc_flags) $(gcj_flags)
+g++                    := upstream/install/bin/$(target)-g++ $(gcc_flags)
+gcc                    := upstream/install/bin/$(target)-gcc $(gcc_flags)
 jar                    := $(shell ((type fastjar &>/dev/null) && echo fastjar) || echo jar)
 
 
 
-#############################################################################
-# Overview:
-# 
-# The Makefile has been divided into phases; each phase depends on the
-# previous one.  Subphases of the same phase (ie 1a, 1b) are not
-# interdependent.  You can think of the build process as proceeding
-# through the phases in order, but processing subphases within a given
-# phase in any order.
-#
-
-# 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
@@ -52,13 +39,10 @@ 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
 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)
 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
@@ -68,13 +52,13 @@ build/c/freetype/%.c: upstream/freetype-2.1.4/src/base/%.c
 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
+build/java/%.java: src/%.java.pp
+       @make -s 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
 build/class/%.class: build/java/%.java .jikes
        @echo -e "\n\033[1mcompiling          .java -> .class: $<\033[0m"
        mkdir -p build/class
@@ -93,7 +77,7 @@ 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 .)
+                sed s_build/class/__ | sed s/.class\$$//g | sed s_/_._g | (cd build/class; xargs ../../upstream/install/bin/gcjh -d ../h --classpath .)
 
 # PHASE 4: object files
 build/$(platform)/%.java.o: build/java/%.java
@@ -104,7 +88,7 @@ build/$(platform)/%.java.o: build/java/%.java
 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 $@
+       $(g++) -I/usr/X11R6/include/ -Iupstream/install/include -Ibuild/h -Iupstream/$(platform)/include -Wno-multichar -c $< -o $@
 
 build/$(platform)/jpeg-6b/%.c.o: upstream/jpeg-6b/src/%.c
        @echo -e "\n\033[1mcompiling             .c -> .o:     $<\033[0m"
@@ -120,14 +104,14 @@ $(target_bin).ar: $(java_object_files) build/$(platform)/org/xwt/plat/$(platform
 $(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) 
+       $(gcj) --main=org.xwt.Main -o build/$(platform)/$(target_bin) $(target_bin).ar -Lupstream/install/lib $(link_flags) 
 
 
 ##############################################################################
 # Special treatment:
 #
 
-build/java/org/xwt/Builtin.java:: $(shell ls src/org/xwt/builtin/*.png src/org/xwt/builtin/*.xwt src/org/xwt/builtin/*.xwf)
+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
@@ -138,25 +122,33 @@ build/java/org/xwt/Builtin.java:: $(shell ls src/org/xwt/builtin/*.png src/org/x
                sed 's_\(.+\)_"\1" +_' >> ../build/java/org/xwt/Builtin.java
        echo "\"\"; }"                           >> build/java/org/xwt/Builtin.java
 
-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/mips/%.o: src/org/xwt/imp/%.c $(gcc_path)/bin/mips-gcc upstream/.freetype
-       @mkdir -p build/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: install_gcc-3.3 compile $(target_bin)
+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" > build/JVM/.manifest
+       cd build/class; $(jar) cfm ../JVM/xwt.jar ../JVM/.manifest `find . -name \*.class`;
+
+
+
+##############################################################################
+# Freetype
+#
+
+build/mips/%.c.o: build/c/freetype/%.c install_freetype-2.1.4
+       make -s install_gcc-3.3 target=mips
+       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 $@ $<
+       upstream/install/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
+build/mips/freetype.mips: $(freetype_sources:%.c=build/mips/%.c.o)
+       make -s install_newlib-1.11.0 target=mips
        @echo -e "\n\033[1mcompiling             .c -> .mips:  $@\033[0m"
        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 \
+       upstream/install/bin/mips-gcc \
                -nostdlib \
                --static \
                -march=mips1 \
@@ -167,23 +159,11 @@ build/mips/freetype.mips: $(gcc_path)/bin/mips-gcc build/mips/crt0.o build/mips/
                build/mips/Freetype.o \
                -lfreetype
 
-
-##############################################################################
-# Supported Platforms:
-#
-
-# 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)
-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" > 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
-       echo
-
+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