2003/05/02 04:37:07

[org.ibex.core.git] / Makefile

diff --git a/Makefile b/Makefile
index 4e7b850..6a843c1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -60,7 +60,7 @@ endif
 compile: $(java_classes) bin/org/xwt/builtin.xwar
 
 # platforms
-all: Win32 Linux Java2 Darwin
+all: Win32 Linux Java2 Darwin Carbon
 
 .javac:
        if \
@@ -151,7 +151,7 @@ $(target_bin): $(java_objects) $(cc_objects) $(c_objects) bin-$(platform)/org/xw
 bin-$(platform)/org/xwt/builtin.o: bin/org/xwt/builtin.xwar
        @echo "wrapping    .xwar -> .o:     bin/org/xwt/builtin.o"
        @(echo "unsigned int builtin_xwar_length = ";\
-         (du -b bin/org/xwt/builtin.xwar | sed "s_bin.*__");\
+         (wc -c bin/org/xwt/builtin.xwar | sed "s_bin.*__");\
          echo \;;\
          echo "unsigned char builtin_xwar[] = {";\
          hexdump -ve '"0x" 1/1 "%x,\n"' bin/org/xwt/builtin.xwar;\
@@ -177,7 +177,7 @@ src/org/ijg/jmorecfg.h: src/org/ijg/jpegsrc.v6b.tar.gz src/org/ijg/jmorecfg.h.pa
        cd src/org/ijg; patch -p0 < jmorecfg.h.patch
        rm -rf src/org/ijg/jpeg-6b
 
-$(cc_objects): bin-$(platform)/%.cc.o: src/%.cc $(java_headers)
+$(cc_objects): bin-$(platform)/%.cc.o: src/%.cc $(java_headers) src/org/ijg/jmorecfg.h
        @echo "compiling     .cc -> .o:     $<"
        @mkdir -p `dirname $@`
        $(g++) -I/usr/X11R6/include/ -I$(gcc_path)/include -Ibin -c $< -o $@
@@ -188,7 +188,7 @@ $(c_objects): bin-$(platform)/%.c.o: src/%.c src/org/ijg/jmorecfg.h
        $(gcc) -Ibin -c $< -o $@
 
 upstream:
-       cvs -d :pserver:cvs@cvs.xwt.org:/cvs co upstream
+       cvs -d :pserver:cvs@cvs.xwt.org:/ co upstream
 
 ## Platforms ##############################################################################
 
@@ -220,6 +220,17 @@ Darwin: upstream
                platform_link="upstream/darwin/*.[oa] $(gcc_path)/lib/libgcj.a" \
                platform_java_sources="POSIX X11"
 
+Carbon: upstream
+       echo -e "\\n=== Carbon ========================================="
+       ranlib upstream/darwin/*.a
+       ar x /usr/lib/libcc_dynamic.a upstream/darwin/darwin-fpsave.o
+       make gcj \
+               platform=Carbon \
+               target=powerpc-apple-darwin \
+               target_bin=xwt.carbon \
+               platform_link="upstream/darwin/*.[oa] $(gcc_path)/lib/libgcj.a" \
+               platform_java_sources="POSIX Carbon"
+
 Java2: $(java_classes) bin/org/xwt/builtin.xwar
        echo -e "\\n=== Java2 ========================================="
        echo "archiving  .class -> .jar"