X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=24e3eddba7fc2b04a5cf2ca19c50a3436a683c71;hb=03721107ea36afc4dd6b64e979d544a4a166591f;hp=14f3505ee598bca646561fad67735d664110d7ed;hpb=c15a08a6a54f44b0f7d427ca7c2064e8e063bd1f;p=org.ibex.core.git 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 $@`