X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=d8c83dc28cbbbcbf2c66f644f003813d465f248c;hb=4c26a1825a0889a8bb2750ed1602d8d6f515de05;hp=49468c556ddb9e1a4467c30d6183c301ef655378;hpb=25f876c0cd07e19d906eea9f617004e7cf57a14b;p=org.ibex.core.git diff --git a/Makefile b/Makefile index 49468c5..d8c83dc 100644 --- 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,17 +151,18 @@ 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 || \ + (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) && \