2003/07/06 04:32:18

[org.ibex.core.git] / Makefile

diff --git a/Makefile b/Makefile
index 2a6a5df..cadb9a6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -187,10 +187,11 @@ $(c_objects): bin-$(platform)/%.c.o: src/%.c src/org/ijg/jmorecfg.h
 upstream:
        cvs -d :pserver:cvs@cvs.xwt.org:/ export -r HEAD upstream
 
-upstream/Carbon/include/Carbon:
+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; \
@@ -241,6 +242,7 @@ Darwin: upstream
 
 Carbon: upstream/Carbon/include/Carbon upstream
        echo -e "\\n=== Carbon ========================================="
+       cd gcc/install/bin; ln -sf gcjh powerpc-apple-darwin-gcjh
        make gcj \
                platform=Carbon \
                target=powerpc-apple-darwin \
@@ -286,8 +288,7 @@ dist: compile
                tail -n 200 .make-dist.out | \
                        mail -s "Unsigned binaries of $(current_build) are now available" cvs@xwt.org
         else
-               ssh xwt@xwt.org verbose=$(verbose) /home/xwt/dist $(this_branch_flag) \
-                       | grep -v "make...:.\(Entering\|Leaving\).directory"
+               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 &> /dev/null &\n echo\n cat .make-dist.out' | ssh xwt@xwt.org | grep -v "make...:.\(Entering\|Leaving\).directory"
         endif
 
 
@@ -299,7 +300,7 @@ dist-private:
        mv gcc gcc-
        ln -s $(HOME)/dist.xwt.org-gcc gcc
        mv -f gcc-/Makefile gcc/
-       mv -f gcc-/gcc.patch gcc/
+       mv -f gcc-/*.patch gcc/
 
        # build it
        nice -n 19 make all