2003/09/10 05:41:36

darcs-hash:20040130070940-2ba56-d8a1a42f9b5ac2872344588ac28ce19eb5e0869f.gz

diff --git a/Makefile b/Makefile
index 8979bc0..8a9f8f7 100644 (file)
--- 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)
 
 
 ##############################################################################