2003/07/15 12:06:38

darcs-hash:20040130070358-2ba56-70ed8dc33e290f8a7b4d9763e2cd1835826bc96f.gz

diff --git a/Makefile b/Makefile
index fad8f65..dda8468 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -63,7 +63,7 @@ compile: .javac .bootclasspath bin/org/xwt/builtin.xwar
                grep -v ^\\[read | sed s_^\\[write\ bin/__ | sed s_.class\\]_.java_ | sed "s_^_compiling   .java -> .class: src/_"
 
 # platforms
-all: Win32 Linux Java2
+all: Win32 Linux Java2 Solaris
 
 .javac:
        if \
@@ -184,8 +184,9 @@ $(c_objects): bin-$(platform)/%.c.o: src/%.c src/org/ijg/jmorecfg.h
        @mkdir -p `dirname $@`
        $(gcc) -Ibin -c $< -o $@
 
-upstream:
+.upstream:
        curl http://www.megacz.com/upstream.tgz | tar xvzf -
+       touch .upstream
 
 upstream/Carbon/include/Carbon: upstream
        # A disgusting hack to create symlinks to the OS X Framework headers, since the
@@ -220,9 +221,8 @@ Linux:
                platform_link="-L$(gcc_path)/lib -L/usr/X11R6/lib -lX11 -lXext --static" \
                platform_java_sources="POSIX X11"
 
-Solaris: upstream
+Solaris: .upstream
        echo -e "\\n=== Solaris ========================================="
-       tar xvzf upstream/Solaris/solaris-libs.tgz
        make gcj \
                platform=Solaris \
                target=sparc-sun-solaris2.7 \