2003/02/27 10:09:10

[org.ibex.core.git] / Makefile

diff --git a/Makefile b/Makefile
index fbe998a..d8c83dc 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -32,7 +32,7 @@ all_platforms          := Win32 Linux Java2
 ## Platform-Neutral ###########################################################################
 
 ifneq ($(verbose),true)
-.SILENT: dist update-build $(jikes_java_objects) .headers $(gcj_java_objects) $(all_platforms) PalmOS bin/org/xwt/builtin.xwar nohup-dist
+.SILENT: $(jikes_java_objects) .headers $(gcj_java_objects) $(all_platforms) bin/org/xwt/builtin.xwar
 silent := --silent
 endif
 
@@ -151,22 +151,23 @@ 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 ''
+#      cvs commit -m '' > /dev/null
 
        echo "***********************************************************"
        echo "*  This build is $(current_build)"
        echo "***********************************************************"
 
        (test `uname -n` = gosset.megacz.com) || \
-               ssh xwt@xwt.org /home/xwt/dist | grep -v "make...:.\(Entering\|Leaving\).directory"
+               ssh xwt@xwt.org verbose=$(verbose) /home/xwt/dist \
+                       | grep -v "make...:.\(Entering\|Leaving\).directory"
 
-       (test `uname -n` = gosset.megacz.com) || \
-               make $(silent) dist-private &> .make-dist.out || \
-                       (cat .make-dist.out | mail -s "Build $(current_build) FAILED" cvs@xwt.org; false)
+       (test `uname -n` = gosset.megacz.com) && \
+               (make $(silent) dist-private 2>> .make-dist.out >> .make-dist.out || \
+                       (cat .make-dist.out | mail -s "Build $(current_build) FAILED" cvs@xwt.org; false))
 
-       (test `uname -n` = gosset.megacz.com) || \
-               cat .make-dist.out | \
-                       mail -s "Unsigned binaries of $(current_build) are now available" cvs@xwt.org < /dev/null
+       (test `uname -n` = gosset.megacz.com) && \
+               (cat .make-dist.out | \
+                       mail -s "Unsigned binaries of $(current_build) are now available" cvs@xwt.org < /dev/null)
 
 dist-private:
        make $(silent) update-build