From f5282a8eb3f07af15c5701d144ab62367bfc0811 Mon Sep 17 00:00:00 2001 From: megacz Date: Fri, 30 Jan 2004 07:35:39 +0000 Subject: [PATCH] 2003/09/16 21:42:05 darcs-hash:20040130073539-2ba56-eeaac300416d3ad3815f93f5b49b09cd44e52fad.gz --- Makefile | 39 ++++++++++++++++----------------------- 1 file changed, 16 insertions(+), 23 deletions(-) diff --git a/Makefile b/Makefile index 73093fe..b356a6e 100644 --- a/Makefile +++ b/Makefile @@ -41,25 +41,14 @@ jar := $(shell ((type fastjar &>/dev/null) && echo fastjar) | include Makefile.upstream # figure out what stuff in org.xwt.plat.* this platform requires (its superclasses) -superclass_%: - @echo $(patsubst org.xwt.plat.%, build/java/org/xwt/plat/%.java, $*) - @make -s superclass_org.xwt.plat.$(shell grep extends src/`echo $* | sed s_\\\\._/_g`.java | head -n 1 | sed s_.\*extends\ __ | sed s_\ .\*__) - all_java_sources := $(patsubst src/%.java, build/java/%.java, $(shell find src -name '*.java')) all_java_sources += $(patsubst src/%.java.pp, build/java/%.java, $(shell find src -name '*.java.pp')) -superclass_org.xwt.plat.Platform:; -ifneq ($(platform),) -plat_deps := $(shell make -s superclass_org.xwt.plat.$(platform) platform= ) -endif - -# HACK: FIXME -ifeq ($(platform),Darwin) -plat_deps += build/java/org/xwt/plat/OpenGL.java -endif - -java_sources := $(filter-out build/java/org/xwt/plat/%, $(all_java_sources)) $(plat_deps) +java_sources := $(all_java_sources) +nonplat_java_sources := $(filter-out build/java/org/xwt/plat/%, $(all_java_sources)) +plat_java_sources := $(filter build/java/org/xwt/plat/%, $(all_java_sources)) +# FIXME: must have a relitavely new GNU sed... Apple sed fails silently (why?) 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 @@ -75,7 +64,7 @@ build/java/%.java: src/%.java.pp build/class/%.class: build/java/%.java .jikes @echo -e "\n\033[1mcompiling .java -> .class: $<\033[0m" mkdir -p build/class - @./.jikes $< + ./.jikes $< compile: .compile .compile: $(all_java_sources) @@ -86,7 +75,7 @@ compile: .compile # PHASE 4: gcj-generated headers java_headers := $(all_java_sources:build/java/%.java=build/h/%.h) -build/h/%.h: build/class/%.class .compile +build/h/%.h: build/class/%.class @echo -e "\n\033[1mextracting .class -> .h: $<\033[0m" mkdir -p `dirname $@` ls `echo $< | sed s/.class\$$//`*.class |\ @@ -114,27 +103,31 @@ build/$(platform)/jpeg-6b/%.c.o: upstream/jpeg-6b/src/%.c $(gcc) -Ibuild/h -c $< -o $@ # PHASE 5: linking +# FIXME use libjpeg jpeg_sources := jdapimin.c jdapistd.c jcomapi.c jcparam.c jdmaster.c jdinput.c jdmainct.c jdcoefct.c jdpostct.c jdmarker.c jpeg_sources += jdhuff.c jdphuff.c jddctmgr.c jidctint.c jidctfst.c jidctflt.c jidctred.c jdsample.c jdcolor.c jdmerge.c jpeg_sources += jquant1.c jquant2.c jerror.c jutils.c jmemnobs.c jmemmgr.c upstream/jpeg-6b/build-$(target)/libjpeg.a: .install_jpeg-6b_$(target) -$(target_bin): upstream/jpeg-6b/build-$(target)/libjpeg.a $(java_sources:build/java/%.java=build/$(platform)/%.java.o) build/$(platform)/org/xwt/plat/$(platform).cc.o build/$(platform)/org/xwt/builtin.res.o build/$(platform)/freetype.res.o +java_objects := $(java_sources:build/java/%.java=build/$(platform)/%.java.o) + +$(target_bin): $(java_objects) upstream/jpeg-6b/build-$(target)/libjpeg.a build/$(platform)/org/xwt/plat/$(platform).cc.o build/$(platform)/org/xwt/builtin.res.o build/$(platform)/freetype.res.o @echo -e "\n\033[1mlinking .o -> $(target_bin)\033[0m" mkdir -p build/$(platform) - PATH=upstream/install/bin:$$PATH $(gcj) -v --main=org.xwt.Main -o build/$(platform)/$(target_bin) $^ $(jpeg_sources:%.c=upstream/jpeg-6b/build-$(target)/%.o) -Lupstream/install/$(target)/lib $(link_flags) + upstream/install/bin/$(target)-ar rcs $(platform).ar $(plat_java_sources:build/java/%.java=build/$(platform)/%.java.o) + PATH=upstream/install/bin:$$PATH $(gcj) -v --main=org.xwt.Main -o build/$(platform)/$(target_bin) $^ $(jpeg_sources:%.c=upstream/jpeg-6b/build-$(target)/%.o) -Lupstream/install/$(target)/lib $(link_flags) build/$(platform)/org/xwt/plat/$(platform).java.o $(platform).ar ############################################################################## # Special treatment: # -build/xwar/org/xwt/builtin.xwar: $(shell ls src/org/xwt/builtin/*.*) +build/xwar/builtin.xwar: $(shell ls src/org/xwt/builtin/*.*) @echo -e "\n\033[1mzipping * -> .xwar: builtin.xwar\033[0m" mkdir -p build/xwar cd src; $(jar) cvf ../build/xwar/builtin.xwar org/xwt/builtin -build/$(platform)/org/xwt/builtin.res.o: build/xwar/org/xwt/builtin.xwar +build/$(platform)/org/xwt/builtin.res.o: build/xwar/builtin.xwar @echo -e "\n\033[1mwrapping .xwar -> .o: builtin.res.o\033[0m" @(echo "unsigned int builtin_xwar_length = "; \ (wc -c build/xwar/builtin.xwar | sed "s_build.*__"); \ @@ -157,9 +150,9 @@ build/$(platform)/freetype.res.o: 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: .compile .vendor .install_gcc-3.3_$(target) $(target_bin) +gcj: .vendor .install_gcc-3.3_$(target) $(target_bin) -build/JVM/xwt.jar: .compile build/xwar/builtin.xwar build/mips/freetype.mips +build/JVM/xwt.jar: $(java_sources:build/java/%.java=build/class/%.class) build/xwar/builtin.xwar build/mips/freetype.mips @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 -- 1.7.10.4