2003/07/05 22:20:26

[org.ibex.core.git] / Makefile

diff --git a/Makefile b/Makefile
index 1cca13e..5d4afb1 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; \
@@ -225,7 +226,8 @@ Win32:
                platform=Win32 \
                target=i686-pc-mingw32 \
                target_bin=xwt.exe \
-               platform_link="-Wl,--subsystem,windows -lcomdlg32"
+               platform_link="-Wl,--subsystem,windows -lcomdlg32" \
+               platform_java_sources="Win32"
 
 Darwin: upstream
        echo -e "\\n=== Darwin ========================================="
@@ -240,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 \
@@ -285,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 'cd /home/xwt ; date=`date +%d-%b-%H%M` ; mkdir xwt-$$date ; cd xwt-$$date ; /usr/bin/cvs -d /cvs co $(this_branch_flag) xwt ; mv xwt/* . ; mv xwt/.* . ; rmdir xwt ; touch .make-dist.out ; nohup make dist &> /dev/null & ; echo ; cat .make-dist.out' | ssh xwt@xwt.org | grep -v "make...:.\(Entering\|Leaving\).directory"
         endif