2003/02/28 04:24:56

darcs-hash:20040130065606-2ba56-f312451f2bc5ac8e29df0c0352d808ffe9874938.gz

diff --git a/Makefile b/Makefile
index ad45441..16e15b7 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -78,7 +78,7 @@ $(shell pwd)/gcc/bin/$(target)-gcj:
 
 gcj: compile $(gcc_path)/bin/$(target)-gcj .headers link
 
-link: $(gcj_java_objects) $(cc_objects)
+link: $(gcj_java_objects) $(cc_objects) bin-$(platform)/org/xwt/builtin.o
        echo "linking       .o -> $(target_bin)"
        $(ar) r bin-$(platform)/org/xwt/plat/platform.ar bin-$(platform)/org/xwt/plat/*.o
        $(gcj) --main=org.xwt.Main -o bin-$(platform)/$(target_bin) $^ $(platform_link) bin-$(platform)/org/xwt/plat/platform.ar
@@ -103,8 +103,8 @@ $(cc_objects): bin-$(platform)/%-nat.o: src/%.cc
        echo -ne "compiling  .cc -> .o:     $$A"
        $(gcc) -Ibin -c $< -o $@
 
-bin-$(platform)/org/xwt/builtin.xwar: $(xwar_sources)
-       echo "archiving   .xwt -> .xwar"
+bin-$(platform)/org/xwt/builtin.o: bin/org/xwt/builtin.xwar
+       echo "wrapping   .xwar -> .o"
        $(gcj) --resource org/xwt/builtin.xwar -c $< -o $@