From bf6d60120ff5ee057ab1fd60d786cbc83f43ee1f Mon Sep 17 00:00:00 2001 From: megacz Date: Fri, 30 Jan 2004 07:35:28 +0000 Subject: [PATCH] 2003/09/15 04:42:17 darcs-hash:20040130073528-2ba56-3263e6bba56629f85796559803a02757c0626855.gz --- Makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index e89bfd9..2a125e4 100644 --- a/Makefile +++ b/Makefile @@ -45,10 +45,11 @@ superclass_%: @echo $* @make -s superclass_org.xwt.plat.$(shell grep extends src/`echo $* | sed s_\\\\._/_g`.java | head -n 1 | sed s_.\*extends\ __ | sed s_\ .\*__) -plat_deps := $(make -s superclass_org.xwt.plat.$(platform) platform= ) -java_sources := $(patsubst org.xwt.plat.%, build/java/org/xwt/plat/%.java, $(plat_deps)) +all_java_sources := $(patsubst src/%.java, build/java/%.java, $(shell find src -name '*.java')) +java_sources := $(filter-out build/java/org/xwt/plat/%, $(all_java_sources)) java_sources += $(patsubst src/%.java.pp, build/java/%.java, $(shell find src -name \*.java.pp)) -java_sources += $(patsubst src/%.java, build/java/%.java, $(shell find src -name '*.java' \! -path 'src/org/xwt/plat/*')) +plat_deps := $(shell test x$(platform) == x"" || make -s superclass_org.xwt.plat.$(platform) platform= ) +java_sources += $(patsubst org.xwt.plat.%, build/java/org/xwt/plat/%.java, $(plat_deps)) 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'`/$< $@ @@ -75,7 +76,7 @@ compile: .compile touch .compile # PHASE 4: gcj-generated headers -java_headers := $(java_sources:build/java/%.java=build/h/%.h) +java_headers := $(all_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 $@` @@ -112,8 +113,7 @@ 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 @echo -e "\n\033[1mlinking .o -> $(target_bin)\033[0m" mkdir -p build/$(platform) - echo "link flags are $(link_flags)" - MACOSX_DEPLOYMENT_TARGET=10.2 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) + 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) ############################################################################## -- 1.7.10.4