2003/02/28 04:51:36

[org.ibex.core.git] / Makefile

diff --git a/Makefile b/Makefile
index ad45441..00cda34 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 $@
 
 
@@ -147,13 +147,13 @@ PalmOS:
        false
 
 
-## dist.xwt.org ############################################################################
+## master.dist.xwt.org ############################################################################
 
 current_build         := $(shell cat next.build)
 
 dist:
        # this will fail if we haven't checked-in since the comment is null; we want this.
-#      cvs commit -m '' > /dev/null
+       cvs commit -m '' > /dev/null
 
        echo "***********************************************************"
        echo "*  This build is $(current_build)"
@@ -184,16 +184,16 @@ dist-private:
        nice -n 19 make all
 
        echo
-       echo === dist.xwt.org ==================================
+       echo === master.dist.xwt.org ==================================
 
        echo "copying xwt.jar to distribution area..."
-       cp bin-Java2/xwt.jar /var/www/dist.xwt.org/xwt-$(current_build).jar.unsigned
+       cp bin-Java2/xwt.jar /var/www/master.dist.xwt.org/xwt-$(current_build).jar.unsigned
 
        echo "stripping xwt.exe and copying it to the distribution area..."
-       $(strip) bin-Win32/xwt.exe -o /var/www/dist.xwt.org/xwt-$(current_build).exe.unsigned
+       $(strip) bin-Win32/xwt.exe -o /var/www/master.dist.xwt.org/xwt-$(current_build).exe.unsigned
 
        echo "copying xwt.linux to distribution area..."
-       $(strip) bin-Linux/xwt.linux -o /var/www/dist.xwt.org/xwt-$(current_build).linux.unsigned
+       $(strip) bin-Linux/xwt.linux -o /var/www/master.dist.xwt.org/xwt-$(current_build).linux.unsigned
 
        echo
        echo "*** DONE ******************************************"