2003/09/27 10:42:26

[org.ibex.core.git] / Makefile

diff --git a/Makefile b/Makefile
index 67dfd0a..0f7ec9b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,9 @@
 
 all:      JVM Linux Win32 Darwin Solaris
 
-clean:; rm -rf .jikes .configure* .install* build .compile
+clean:
+       rm -rf .jikes .configure* .install* build .compile
+       find upstream -name config.cache | xargs rm
 
 JVM:        build/JVM/xwt.jar
 Linux:    ; make gcj platform=Linux   target=i686-pc-linux-gnu    link_flags="-lX11 -lXext"
@@ -255,7 +257,7 @@ dist: compile
                        mail -s "Unsigned binaries of $(current_build) are now available" cvs@xwt.org
         else
 #              echo -e 'export JAVA_HOME=/usr/lib/j2sdk1.4\n cd /home/xwt\n date=`date +%d-%b-%H%M`\n mkdir xwt-$$date\n cd xwt-$$date\n /usr/bin/cvs -d /cvs co $(this_branch_flag) xwt\n mv xwt/* .\n mv xwt/.* .\n rmdir xwt\n touch .make-dist.out\n nohup make dist &\n echo\n cat .make-dist.out' | ssh xwt@xwt.org | grep -v "make...:.\(Entering\|Leaving\).directory"
-               echo -e 'export JAVA_HOME=/usr/lib/j2sdk1.4\n cd /home/xwt/dist\n/usr/bin/cvs update $(this_branch_flag)\ntouch .make-dist.out\n make clean\n nohup make dist &\n echo\n cat .make-dist.out' | ssh xwt@xwt.org | grep -v "make...:.\(Entering\|Leaving\).directory"
+               echo -e 'export JAVA_HOME=/usr/lib/j2sdk1.4\n cd /home/xwt/dist\n/usr/bin/cvs update $(this_branch_flag)\ntouch .make-dist.out\n make clean\n nohup make dist &\n' | ssh xwt@xwt.org | grep -v "make...:.\(Entering\|Leaving\).directory"
         endif
 
 dist-private:
@@ -278,9 +280,9 @@ dist-private:
        upstream/install/i686-pc-linux-gnu/bin/strip build/Linux/xwt.linux \
                -o /var/www/master.dist.xwt.org/xwt-$(current_build).linux.unsigned
 
-       echo "copying xwt.solaris to distribution area..."
-       upstream/install/sparc-sun-solaris2.7/bin/strip build/Solaris/xwt.solaris \
-               -o /var/www/master.dist.xwt.org/xwt-$(current_build).solaris.unsigned
+#      echo "copying xwt.solaris to distribution area..."
+#      upstream/install/sparc-sun-solaris2.7/bin/strip build/Solaris/xwt.solaris \
+#              -o /var/www/master.dist.xwt.org/xwt-$(current_build).solaris.unsigned
 
        echo "copying xwt.darwin to distribution area..."
        upstream/install/powerpc-apple-darwin/bin/strip build/Darwin/xwt.darwin \