2003/07/16 01:29:49

darcs-hash:20040130070403-2ba56-0236a5746130031448f3e77910e7a2fcdcf842be.gz

diff --git a/Makefile b/Makefile
index 73c02a1..f79a9d0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -134,7 +134,7 @@ propose-patch:
 ## GCJ-Derived Platforms #######################################################################
 
 # if the user doesn't change gcc_path, and it's not built, then we'll try to build it
-$(shell pwd)/gcc/install/bin/$(target)-gcj:
+$(shell pwd)/gcc/install/bin/$(target)-gcj: .upstream
        make -C gcc
 
 # compile is here to force compilation of the .class files (they get used via -Ibin/) without
@@ -185,30 +185,9 @@ $(c_objects): bin-$(platform)/%.c.o: src/%.c src/org/ijg/jmorecfg.h
        $(gcc) -Ibin -c $< -o $@
 
 .upstream:
-       curl http://www.megacz.com/upstream.tgz | tar xvz -L -f -
+       mkdir -p gcc/install; curl http://www.megacz.com/upstream.tgz | tar xvzhf - -C gcc/install
        touch .upstream
 
-upstream/Carbon/include/Carbon: upstream
-       # A disgusting hack to create symlinks to the OS X Framework headers, since the
-       # standard GCC doesn't know how to search Frameworks for header files.
-       outdir="upstream/Carbon/include"; \
-       mkdir -p $$outdir; \
-       librarydir="/System/Library"; \
-       frameworksubdir="Frameworks"; \
-       cd $$outdir; \
-       function CreateHeaderDirectories() \
-       { \
-               for framework in `ls -d $$1/*.framework`; do \
-                       name=`echo $$framework | sed 's/.*\/\([^/]*\)\.framework/\1/'`; \
-                       if [[ $$name != "" && ! -e $$name && -e $$framework/Headers ]]; then \
-                               ln -s $$framework/Headers $$name; \
-                               if [[ -e $$framework/$$frameworksubdir ]]; then \
-                                       CreateHeaderDirectories $$framework/$$frameworksubdir; \
-                               fi; \
-                       fi; \
-               done; \
-       }; \
-       CreateHeaderDirectories $$librarydir/$$frameworksubdir;
 
 ## Platforms ##############################################################################
 
@@ -221,7 +200,7 @@ Linux:
                platform_link="-L$(gcc_path)/lib -L/usr/X11R6/lib -lX11 -lXext --static" \
                platform_java_sources="POSIX X11"
 
-Solaris: .upstream
+Solaris:
        echo -e "\\n=== Solaris ========================================="
        make gcj \
                platform=Solaris \
@@ -239,7 +218,7 @@ Win32:
                platform_link="-Wl,--subsystem,console -lcomdlg32" \
                platform_java_sources="Win32"
 
-Darwin: upstream
+Darwin:
        echo -e "\\n=== Darwin ========================================="
        ranlib upstream/Darwin/lib/*.a
        ar x /usr/lib/libcc_dynamic.a upstream/Darwin/lib/darwin-fpsave.o
@@ -250,7 +229,7 @@ Darwin: upstream
                platform_link="upstream/Darwin/lib/*.[oa] $(gcc_path)/lib/libgcj.a" \
                platform_java_sources="POSIX X11"
 
-Carbon: upstream/Carbon/include/Carbon upstream
+Carbon:
        echo -e "\\n=== Carbon ========================================="
        make gcj \
                platform=Carbon \