X-Git-Url: http://git.megacz.com/?p=org.ibex.core.git;a=blobdiff_plain;f=Makefile;fp=Makefile;h=57426347f268e3f279943b06a0907080f104e23c;hp=3fe690fec36bc3b4036b6e5a249cb6cd2dd23cc0;hb=72069509b7c178b9bf3310fef366db4ad179413f;hpb=b3193eb9454ece679467cce509aad071f1916577 diff --git a/Makefile b/Makefile index 3fe690f..5742634 100644 --- a/Makefile +++ b/Makefile @@ -167,10 +167,10 @@ build/java/org/ibex/%.java: src/org/ibex/%.java build/class/org/ibex/util/Prepro @echo -e "\033[1mpreprocessing .java -> .java: $<\033[0m" @mkdir -p `dirname $@`; java -cp build/class:upstream/gnu.regexp-1.1.4/src/src org.ibex.util.Preprocessor < $< > $@ -upstream/org.ibex.crypto/%.java:; @make -s .download_org.ibex.crypto &>/dev/null -upstream/org.ibex.nestedvm/%.java:; @make -s .download_org.ibex.nestedvm &>/dev/null +upstream/org.ibex.crypto/%.java:; @make .download_org.ibex.crypto +upstream/org.ibex.nestedvm/%.java:; @make .download_org.ibex.nestedvm link_upstream = build/java/$(1): $(2)/$(1); -link_upstream += @echo -e "\033[1mlinking .java -> .java: $$< -> $$@\033[0m"; +link_upstream += @echo -e "\033[1mlinking .java -> .java: $$@\033[0m"; link_upstream += mkdir -p $$(@D); link_upstream += ln -fs `echo $$(@D)/ | sed 's_[^/]*//*_../_g'`/$$< $$@ $(call link_upstream,org/xwt/mips/%.java,upstream/org.ibex.nestedvm/src,.download_org.ibex.nestedvm)