2003/03/27 01:11:35

[org.ibex.core.git] / Makefile

diff --git a/Makefile b/Makefile
index c1fdeb4..e9d7404 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -5,8 +5,8 @@
 ## Configurables ###########################################################################
 
 # inputs
-javac_java_sources     := $(shell find src -name *.java)
-gcj_java_sources       := $(shell find src -name *.java \! -path src/org/xwt/plat/\*) src/org/xwt/plat/GCJ.java $(platform_java_sources)
+javac_java_sources     := $(shell find src -name \*.java)
+gcj_java_sources       := $(shell find src -name \*.java \! -path src/org/xwt/plat/\*) src/org/xwt/plat/GCJ.java $(platform_java_sources)
 xwar_sources           := $(shell ls src/org/xwt/builtin/*.png src/org/xwt/builtin/*.xwt src/org/xwt/builtin/*.xwf)
 cc_sources             := src/org/xwt/plat/$(platform).cc
 
@@ -61,12 +61,9 @@ all: $(all_platforms)
        fi \
 
 jikes:
-       wget ftp://www-126.ibm.com/pub/jikes/1.18/jikes-1.18.tar.bz2 -O jikes-1.18.tar.bz2
-       bunzip2 jikes-1.18.tar.bz2
-       tar xvf jikes-1.18.tar && rm jikes-1.18.tar
-       cd jikes-1.18; ./configure --prefix=`pwd`
-       cd jikes; make && make install
-       ln -s jikes-1.18/bin/jikes .jikes
+       curl ftp://www-126.ibm.com/pub/jikes/1.18/jikes-1.18.tar.bz2 | tar xjvf -
+       cd jikes-1.18; ./configure --prefix=`pwd` && make && make install
+       ln -sf jikes-1.18/bin/jikes .jikes
 
 $(javac_java_objects): $(javac_java_sources) .javac
        test "$(JAVA_HOME)"x != x || (echo "you forgot to set your JAVA_HOME environment variable"; false)
@@ -211,7 +208,7 @@ dist:
        echo "*  This build is $(current_build)"
        echo "***********************************************************"
 
-        ifeq ($(shell uname -n),gosset.megacz.com)
+        ifeq ($(shell uname -n),serverbeach.megacz.com)
                (make $(silent) dist-private 2>&1) >> .make-dist.out || \
                        (tail -n 200 .make-dist.out | mail -s "Build $(current_build) FAILED" cvs@xwt.org; false)
                tail -n 200 .make-dist.out | \