X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=73c02a143e0fb8a4bc9e44a34fac357d73734a55;hb=97029747724b528f8a4b714f84118dc6b1e30975;hp=fad8f658606f157c3de1c2f315530e38b0de07d3;hpb=eebdeb5d031d072451eceaa54b43c07373199cff;p=org.ibex.core.git

diff --git a/Makefile b/Makefile
index fad8f65..73c02a1 100644
--- 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:
-	curl http://www.megacz.com/upstream.tgz | tar xvzf -
+.upstream:
+	curl http://www.megacz.com/upstream.tgz | tar xvz -L -f -
+	touch .upstream
 
 upstream/Carbon/include/Carbon: upstream
 	# A disgusting hack to create symlinks to the OS X Framework headers, since the
@@ -220,14 +221,13 @@ 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 \
 		target_bin=xwt.solaris \
-		platform_link="-L$(gcc_path)/lib -L/usr/X11R6/lib -lX11 -lXext" \
+		platform_link="-L$(gcc_path)/lib -lX11 -lXext" \
 		platform_java_sources="POSIX X11"
 
 Win32: