X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=8a9f8f7018c74c6e55ce683cd0706aeb50396e4b;hb=1d7de542b2adfd312fad0bdfa26e3f852491a8d9;hp=8979bc0a64c910dcc3b304c06f2b8a99c50253a6;hpb=0f3eb4684d74eb72ea919798a6def3e6a445a0bb;p=org.ibex.core.git

diff --git a/Makefile b/Makefile
index 8979bc0..8a9f8f7 100644
--- a/Makefile
+++ b/Makefile
@@ -93,16 +93,16 @@ build/$(platform)/jpeg-6b/%.c.o: upstream/jpeg-6b/src/%.c
 	$(gcc) -Ibuild/h -c $< -o $@
 
 # PHASE 5: linking
-$(target_bin).ar: $(java_sources:build/java/%.java=build/$(platform)/%.java.o) build/$(platform)/org/xwt/plat/$(platform).cc.o $(jpeg_object_files)
+build/$(target)/$(target_bin).ar: $(java_sources:build/java/%.java=build/$(platform)/%.java.o) build/$(platform)/org/xwt/plat/$(platform).cc.o $(jpeg_object_files)
 	@echo -e "\n\033[1marchiving             .o -> $(target_bin).ar\033[0m"
-	rm -f $(target_bin).ar
-	upstream/install/$(target)/bin/ar -cq $(target_bin).ar $^
-	upstream/install/$(target)/bin/ranlib $(target_bin).ar
+	rm -f build/$(target)/$(target_bin).ar
+	upstream/install/$(target)/bin/ar -cq build/$(target)/$(target_bin).ar $^
+	upstream/install/$(target)/bin/ranlib build/$(target)/$(target_bin).ar
 
-$(target_bin): $(target_bin).ar
+$(target_bin): build/$(target)/$(target_bin).ar
 	@echo -e "\n\033[1mlinking               .o -> $(target_bin)\033[0m"
 	mkdir -p build/$(platform)
-	PATH=upstream/install/bin:$$PATH $(gcj) --main=org.xwt.Main -o build/$(platform)/$(target_bin) $(target_bin).ar -Lupstream/install/$(target)/lib $(link_flags)
+	PATH=upstream/install/bin:$$PATH $(gcj) --main=org.xwt.Main -o build/$(platform)/$(target_bin) build/$(target)/$(target_bin).ar -Lupstream/install/$(target)/lib $(link_flags)
 
 
 ##############################################################################