X-Git-Url: http://git.megacz.com/?p=org.ibex.core.git;a=blobdiff_plain;f=Makefile;fp=Makefile;h=65412b18bc4ac6d013d42204030093901846ed47;hp=c0ed5ac879d3528373e2ce61b9ba29c3fb4a6018;hb=ea1719e7d138393d6998253a61db2df5727fc298;hpb=3327346e1a6b76cd6252db8b33eb0b8310596599

diff --git a/Makefile b/Makefile
index c0ed5ac..65412b1 100644
--- a/Makefile
+++ b/Makefile
@@ -166,8 +166,7 @@ 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 += mkdir -p $$(@D);
-link_upstream += ln -fs `echo $$(@D)/ | sed 's_[^/]*//*_../_g'`/$$< $$@
+link_upstream += mkdir -p $$(@D); ln -fs `echo $$(@D)/ | sed 's_[^/]*//*_../_g'`/$$< $$@
 build/cc/%.cc:     src/%.c    ; @echo linking $@; mkdir -p $(@D); ln -fs `echo $(@D)/ | sed 's_[^/]*//*_../_g'`/$< $@
 build/res/%:       src/%      ; @echo linking $@; mkdir -p $(@D); ln -fs `echo $(@D)/ | sed 's_[^/]*//*_../_g'`/$< $@
 $(call link_upstream,org/xwt/mips/%.java,upstream/org.ibex.nestedvm/src,.download_org.ibex.nestedvm)
@@ -202,7 +201,7 @@ build/class/org/ibex/util/MIPSApps.class: build/mips/mipsapps.mips .install_org.
 	java -cp upstream/org.ibex.nestedvm/build:upstream/org.ibex.nestedvm/upstream/build/bcel-5.1/bcel-5.1.jar \
 		org.xwt.mips.Compiler org.ibex.util.MIPSApps $< -outfile $@
 
-build/Java2/ibex.jar: .compile build/res/builtin.jar build/class/org/ibex/util/MIPSApps.class
+build/Java2/ibex.jar: $(java_classes) build/res/builtin.jar build/class/org/ibex/util/MIPSApps.class
 	@echo -e "\n\033[1marchiving         .class -> .jar:   build/Java2/ibex.jar\033[0m"
 	mkdir -p build/Java2
 	echo -e "Manifest-Version: 1.0\nMain-Class: org.ibex.core.Main\n" > build/Java2/.manifest