From 03721107ea36afc4dd6b64e979d544a4a166591f Mon Sep 17 00:00:00 2001 From: megacz Date: Fri, 30 Jan 2004 07:35:31 +0000 Subject: [PATCH] 2003/09/15 09:37:16 darcs-hash:20040130073531-2ba56-4a85d2858dec87d3bf16ec0bacd3aa97aff2f339.gz --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 14f3505..24e3edd 100644 --- a/Makefile +++ b/Makefile @@ -52,9 +52,9 @@ superclass_%: @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')) -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)) +all_java_sources += $(patsubst src/%.java.pp, build/java/%.java, $(shell find src -name \*.java.pp)) plat_deps := $(shell test x$(platform) == x"" || make -s superclass_org.xwt.plat.$(platform) platform= ) +java_sources := $(filter-out build/java/org/xwt/plat/%, $(all_java_sources)) 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'`/$< $@ @@ -82,7 +82,7 @@ compile: .compile touch .compile # PHASE 4: gcj-generated headers -java_headers := $(all_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 $@` -- 1.7.10.4