2003/09/04 07:16:50
[org.ibex.core.git] / Makefile
index 30ba19c..239f18e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -10,17 +10,18 @@ all:                   JVM Linux Win32 Java2 #Solaris
 #############################################################################
 # Configurables:
 #
-target_bin             := xwt.$(shell echo $(target) | tr A-Z a-z)
+target_bin             := xwt.$(shell echo $(platform) | tr A-Z a-z)
 jikes_flags            := -verbose -nowarn -sourcepath src/
-gcc_path               := upstream/gcc-3.3/install
+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_flags              := $(gcc_optimizations) -Ibuild/h
+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
+
+gcjh                   := $(gcc_path)/bin/gcjh
 as                     := $(gcc_path)/$(target)/bin/as
 ar                     := $(gcc_path)/$(target)/bin/ar
 ranlib                 := $(gcc_path)/$(target)/bin/ranlib
@@ -40,33 +41,33 @@ jar                    := $(shell ((type fastjar &>/dev/null) && echo fastjar) |
 #
 
 
-# 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
 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
+       make -sC upstream jpeg-6b/src
 
-freetype_sources    := $(patsubst %,upstream/freetype-2.1.4/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/%,smooth/smooth.c autohint/autohint.c sfnt/sfnt.c truetype/truetype.c)
+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
+       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-3.3-$(target)
+       make -sC upstream gcc-3.3-$(target)
+
+
+# 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)
 
 
 # PHASE 2: ready-to-compile java files (either symlinked to phase 1a sources or else generated from them)
@@ -74,94 +75,109 @@ 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
+#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       
+       ln -s $$C
 
 
 # PHASE 3: class files
 class_files           := $(java_sources:build/java/%.java=build/class/%.class)
-class_files           += build/class/org/xwt/imp/Freetype.class
-$(class_files): build/class/%.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/%.class: build/java/%.java upstream/.jikes
+       @echo "compiling          .java -> .class: $<"
+       @mkdir -p build/class
+       @upstream/.jikes $<
+
+compile: .compile
+.compile: $(java_sources)
+       @echo "compiling          .java -> .class: src/**/*.java"
+       @mkdir -p build/class
+       @upstream/.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
+java_headers          := $(java_sources:build/java/%.java=build/h/%.h)
+$(java_headers): build/h/%.h: build/class/%.class .compile
        @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 .
+       @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 .)
 
 # 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
+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:src/%.c=build/$(platform)/%.c.o)
-$(java_objects): build/$(platform)/%.java.o: src/%.java
+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
        @echo "compiling          .java -> .o:     $<"
-       mkdir -p `dirname $@`
-       $(gcj) -c $< -o $@
-$(cc_object_files): build/$(platform)/%.cc.o: src/%.cc $(java_headers) src/org/ijg/jmorecfg.h
+       @mkdir -p `dirname $@`
+       @$(gcj) -c $< -o $@
+$(cc_object_files): build/$(platform)/%.cc.o: src/%.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)/%.c.o: src/%.c src/org/ijg/jmorecfg.h
+       @$(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
        @echo "compiling             .c -> .o:     $<"
        @mkdir -p `dirname $@`
-       $(gcc) -Ibuild/h -c $< -o $@
+       @$(gcc) -Ibuild/h -c $< -o $@
 
 # PHASE 5: linking
-$(target_bin): $(objects)
+$(target_bin): $(java_object_files) $(cc_object_files) $(c_object_files)
        @echo "linking               .o -> $(target_bin)"
-       $(gcj) --main=org.xwt.Main -o build/$(platform)/$(target_bin) $^ $(platform_link) 
+       @mkdir -p build/$(platform)
+       @$(gcj) --main=org.xwt.Main -o build/$(platform)/$(target_bin) $^ $(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"
-       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/%=%) | \
+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
+       @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 < $< > $@
+       @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:  $<"
+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:
-       make -C upstream gcc-3.3-mips freetype-2.1.4/src 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
 
 
 
@@ -172,29 +188,29 @@ 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) ========================================="
+       @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
-       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 \
+       @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
+       @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
-       echo
+               org/xwt/plat/AWT*.class org/xwt/plat/Java2*.class
+       @echo
 
 
 
@@ -202,8 +218,6 @@ JVM: compile
 # Misc
 #
 
-mkdirs:
-       mkdir -p build build/java build/class build/h build
 clean:
        find . -name \*~ | xargs rm -f
        find . -name \#\*\# | xargs rm -f
@@ -307,13 +321,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