2004/01/19 05:51:38

[org.ibex.core.git] / Makefile

diff --git a/Makefile b/Makefile
index cf38732..4de2701 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,6 @@
 #############################################################################
 #
 # The XWT Makefile
-
 #
 
 target_Darwin := powerpc-apple-darwin
@@ -43,22 +42,41 @@ gcc_optimizations  := -O2
 #gcc_optimizations  := -O9 -ffast-math -fomit-frame-pointer -foptimize-sibling-calls
 #gcc_optimizations  += -finline-functions -funroll-loops -ffunction-sections -fdata-sections
 
-gcc_flags          := -nostdinc $(gcc_optimizations) -Ibuild/h -Iupstream/jpeg-6b/src/ -Iupstream/jpeg-6b/build-$(target)
-gcc_flags          += -Iupstream/install/$(target)/include -Iupstream/install/lib/gcc-lib/$(target)/3.3/include
-gcc_flags          += -Iupstream/install/include
-gcj_flags          := -fCLASSPATH=build/java
-g++_flags          := -Iupstream/install/lib/gcc-lib/$(target)/3.3/include/ -Iupstream/install/$(target)/include -Wno-multichar
-gcj                := upstream/install/bin/$(target)-gcj $(gcc_flags) $(gcj_flags)
+gcc_flags          := -nostdinc $(gcc_optimizations) -Ibuild/h -Iupstream/jpeg-6b/src -Iupstream/jpeg-6b/build-$(target)
+gcc_flags          += -Iupstream/install/lib/gcc-lib/$(target)/3.3/include -Iupstream/install/$(target)/include
+gcj                := upstream/install/bin/$(target)-gcj $(gcc_flags) -fCLASSPATH=build/java
 gcjh               := $(shell pwd)/upstream/install/bin/$(shell test -e upstream/install/bin/$(target)-gcjh && echo $(target)-)gcjh
-g++                := upstream/install/bin/$(target)-gcj $(gcc_flags)
-gcc                := upstream/install/bin/$(target)-gcc $(gcc_flags) $(g++_flags)
+g++                := upstream/install/bin/$(target)-gcj $(gcc_flags) -Iupstream/install/include -Wno-multichar
+gcc                := upstream/install/bin/$(target)-gcc $(gcc_flags)
 jar                := $(shell ((type fastjar &>/dev/null) && echo fastjar) || echo jar)
 
-gcj: .install_gcc-3.3_$(target); make $(target_bin) link_flags="$(link_flags)" platform=$(platform)
+gcj: .install_gcc-3.3_$(target); make build/$(platform)/$(target_bin) link_flags="$(link_flags)" platform=$(platform)
 
 include Makefile.upstream
 
 java_sources              := $(patsubst src/%.java,     build/java/%.java, $(shell find src -name '*.java' | grep -v Preprocessor))
+java_sources              += build/java/org/xwt/mips/Errno.java
+java_sources              += build/java/org/xwt/mips/Unistd.java
+java_sources              += build/java/org/xwt/mips/Syscalls.java
+java_sources              += build/java/org/xwt/mips/Registers.java
+java_sources              += build/java/org/xwt/mips/Runtime.java
+java_sources              += build/java/org/xwt/mips/UnixRuntime.java
+java_sources              += build/java/org/xwt/mips/util/SeekableByteArray.java
+java_sources              += build/java/org/xwt/mips/util/SeekableData.java
+java_sources              += build/java/org/xwt/mips/util/SeekableFile.java
+java_sources              += build/java/org/xwt/mips/util/SeekableInputStream.java
+
+build/java/org/xwt/mips/util/%: .install_mips2java
+       @echo linking $@
+       @mkdir -p $(@D)
+       @cd $(@D); ln -sf ../../../../../../upstream/mips/org/xwt/mips/util/$*
+build/java/org/xwt/mips/%: .install_mips2java
+       @echo linking $@
+       @mkdir -p $(@D)
+       @test -e upstream/mips/build/org/xwt/mips/$* && (cd $(@D); \
+               ln -sf ../../../../../upstream/mips/build/org/xwt/mips/$*); true
+       @test -e upstream/mips/org/xwt/mips/$* && (cd $(@D); \
+               ln -sf ../../../../../upstream/mips/org/xwt/mips/$*); true
 
 
 ### Java Class Files ##############################################################################
@@ -146,7 +164,7 @@ build/$(platform)/$(platform).ar: $(java_sources:build/java/%.java=build/$(platf
        upstream/install/$(target)/bin/ranlib $@
 
 upstream/jpeg-6b/build-$(target)/libjpeg.a: .install_jpeg-6b_$(target)
-$(target_bin): build/$(platform)/org/xwt/plat/$(platform).cc.o upstream/jpeg-6b/build-$(target)/libjpeg.a build/$(platform)/builtin.o build/$(platform)/$(platform).ar 
+build/$(platform)/$(target_bin): build/$(platform)/org/xwt/plat/$(platform).cc.o upstream/jpeg-6b/build-$(target)/libjpeg.a build/$(platform)/builtin.o build/$(platform)/$(platform).ar 
        @echo -e "\n\033[1mlinking               .o -> $(target_bin)\033[0m"
        mkdir -p build/$(platform)
        PATH=upstream/install/bin:$$PATH $(gcj) -v --main=org.xwt.Main -o $@ -Lupstream/install/$(target)/lib build/$(platform)/org/xwt/plat/$(platform).java.o $^ $(link_flags)
@@ -236,13 +254,13 @@ strip_$(target) := upstream/install/$(target)/bin/strip build/$(platform)/$(targ
 strip_JVM       := cp build/$(platform)/$(target_bin)
 install-dist:;     $(strip_$(target)) /var/www/master.dist.xwt.org/xwt-$(current_build).$(target_bin_extension).unsigned
 dist: compile
-        ifneq ($(shell uname -n),megacz.com)
-               echo "***********************************************************"
-               echo "*  This build is $(current_build)                                     *"
-               echo "***********************************************************"
-               cvs commit -m '' > /dev/null     # this will fail if we haven't checked-in since the comment is null; we want this.
-               echo -e 'cd /home/xwt/\nrm -rf xwt\n/usr/bin/cvs co xwt\nnohup make -C xwt dist 2>&1 >> .make-dist.out &\n' |\
-                        ssh xwt@xwt.org | grep -v "make...:.\(Entering\|Leaving\).directory"
+ifneq ($(shell uname -n),megacz.com)
+       echo "***********************************************************"
+       echo "*  This build is $(current_build)                                     *"
+       echo "***********************************************************"
+       cvs commit -m '' > /dev/null     # this will fail if we haven't checked-in since the comment is null; we want this.
+       echo -e 'cd /home/xwt/\nrm -rf xwt\n/usr/bin/cvs -d /cvs co xwt\nnohup make -C xwt dist 2>&1 >> .make-dist.out &\n' |\
+                ssh xwt@xwt.org | grep -v "make...:.\(Entering\|Leaving\).directory"
 else
        (echo -n 0000; (echo "10k16o16i"; cat next.build | tr a-z A-Z; echo "1+f") | dc) | tail --bytes=5 > next.build-
        mv next.build- next.build