2003/07/05 22:11:55

[org.ibex.core.git] / Makefile

diff --git a/Makefile b/Makefile
index d981791..57a956c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -30,11 +30,11 @@ gcc_path               := $(shell pwd)/gcc/install
 gcc_optimizations      := -O2
 debug                  := 
 gcc_flags              := $(gcc_optimizations) $(debug) -Isrc/org/ijg
-gcj_flags              := -fCLASSPATH=bin 
+gcj_flags              := -fCLASSPATH=src
 gcj                    := $(gcc_path)/bin/$(target)-gcj $(gcj_flags) $(gcc_flags)
 g++                    := $(gcc_path)/bin/$(target)-g++ $(gcc_flags)
 gcc                    := $(gcc_path)/bin/$(target)-gcc $(gcc_flags)
-gcjh                   := $(gcc_path)/bin/gcjh
+gcjh                   := $(gcc_path)/bin/$(target)-gcjh
 
 as                     := $(gcc_path)/$(target)/bin/as
 ar                     := $(gcc_path)/$(target)/bin/ar
@@ -161,10 +161,6 @@ $(java_headers): bin/%.h: bin/%.class
                sed s_/_._g | sed s/.class$$// | sed s/.java$$// |\
                        xargs $(gcjh) --classpath .
 
-# special rule to stop GCJ from choking
-bin-$(platform)/org/xwt/SpecialBoxProperty.java.o: src/org/xwt/SpecialBoxProperty.java
-       $(gcj) -c bin/org/xwt/SpecialBoxProperty*.class -o bin-$(platform)/org/xwt/SpecialBoxProperty.java.o
-
 $(java_objects): bin-$(platform)/%.java.o: src/%.java
        @echo "compiling   .java -> .o:     $<"
        mkdir -p `dirname $@`
@@ -191,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; \
@@ -229,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 ========================================="
@@ -244,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 \