X-Git-Url: http://git.megacz.com/?p=org.ibex.core.git;a=blobdiff_plain;f=Makefile;h=cb9db8d5aeb11896e7733c488e553787e54b8ace;hp=cf3873209ecd5ec12368ea62120a0b25938f1838;hb=fd4cf59adec810b376f6a6ef264f9a76efa48b28;hpb=36b17515a42e468be7db1346384ce98df3e30882

diff --git a/Makefile b/Makefile
index cf38732..cb9db8d 100644
--- a/Makefile
+++ b/Makefile
@@ -43,15 +43,12 @@ 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)
@@ -59,6 +56,28 @@ gcj: .install_gcc-3.3_$(target); make $(target_bin) link_flags="$(link_flags)" p
 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 ##############################################################################