fixed statics bug

[org.ibex.core.git] / Makefile

diff --git a/Makefile b/Makefile
index 3d823cb..811ea86 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@
 
 ifeq ($(platform),)
 # default
-platform := JVM
+platform := Java2
 endif
 
 target_Darwin := powerpc-apple-darwin
@@ -16,7 +16,7 @@ target_Solaris := sparc-sun-solaris2.7
 target_Linux := i686-pc-linux-gnu
 target := $(target_$(platform))
 
-all:         JVM Linux Win32 Darwin Solaris
+all:         Java2 Linux Win32 Darwin Solaris
 
 clean:      ; rm -rf build
 dist-clean:
@@ -32,7 +32,8 @@ libwing_Solaris := -Lupstream/install/sparc-sun-solaris2.7/lib/
 libwing_Solaris +=   upstream/install/sparc-sun-solaris2.7/lib/libWINGs.a
 libwing_Solaris +=   upstream/install/sparc-sun-solaris2.7/lib/libwraster.a
 
-JVM:        build/JVM/ibex.jar
+Java2:        build/JVM/ibex.jar
+JVM:; make Java2
 Linux:    ; make gcj platform=Linux   link_flags="$(libwing_Linux) -lXpm -lX11 -lXext"
 Solaris:  ; make gcj platform=Solaris link_flags="$(libwing_Solaris) -lXpm -lX11 -lXext -lpthread"
 Win32:    ; make gcj platform=Win32   link_flags="-Wl,--subsystem,windows -lcomdlg32"
@@ -93,10 +94,11 @@ plat_classes_Linux   := org.ibex.plat.Linux $(plat_classes_X11)
 plat_classes_Solaris := org.ibex.plat.Solaris $(plat_classes_X11)
 plat_classes_Darwin  := org.ibex.plat.Darwin org.ibex.plat.OpenGL $(plat_classes_POSIX)
 
-bleh:; @echo $(plat_classes_$(platform))
-java_src_sources          := $(patsubst %,src/%.java,$(subst .,/,$(plat_classes_$(platform))))
-java_src_sources          += $(shell find src -name '*.java' | grep -v Preprocessor | grep -v /plat/)
+plat_java_src_sources     := src/org/ibex/plat/$(platform).java
+java_src_sources          := $(shell find src -name '*.java' | grep -v Preprocessor | grep -v plat)
+java_src_sources          += $(plat_java_src_sources)
 java_sources              := $(patsubst src/%.java,     build/java/%.java, $(java_src_sources))
+
 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
@@ -127,10 +129,18 @@ build/java/org/xwt/mips/%:
 
 ### Java Source Files ##############################################################################
 
+ifeq ($(platform),Java2)
+.preprocessor: src/org/ibex/util/Preprocessor.java src/org/ibex/util/Vec.java src/gnu/regexp/*.java
+       @make .jikes
+       @mkdir -p build/class/org/ibex/util build/class/gnu/regexp
+       ./.jikes $^ -d build/class
+       @touch $@
+else
 .preprocessor: src/org/ibex/util/Preprocessor.java src/org/ibex/util/Vec.java src/gnu/regexp/*.java
        @mkdir -p build/class/org/ibex/util build/class/gnu/regexp
        $(gcj) -Isrc -C $^ -d build/class
        @touch $@
+endif
 build/cc/%.cc:     src/%.c    ; @echo linking $@; mkdir -p $(@D); ln -fs `echo $(@D)/ | sed 's_[^/]*//*_../_g'`/$< $@
 build/res/%:       src/%      ; @echo linking $@; mkdir -p $(@D); ln -fs `echo $(@D)/ | sed 's_[^/]*//*_../_g'`/$< $@
 build/java/org/ibex/%.java: src/org/ibex/%.java .preprocessor
@@ -153,8 +163,8 @@ build/class/org/ibex/translators/MIPSApps.class: build/mips/mipsapps.mips .jikes
 compile: .compile
 .compile: .install_mips2java .download_bcel-5.1 $(java_sources) $(java_classes); touch $@
 
-ifeq ($(platform),JVM)
-build/class/%.class: build/java/%.java .jikes
+ifeq ($(platform),Java2)
+build/class/%.class: .preprocessor $(java_sources) .jikes
        @echo -e "\n\033[1mcompiling          .java -> .class: $<\033[0m"
        rm -rf build/class
        mkdir -p build/class
@@ -166,7 +176,7 @@ build/class/%.class: build/java/%.java
        $(gcj) -I$(bcel_jar) -C -O0 $< -d build/class
 endif
 
-build/JVM/ibex.jar: build/res/builtin.jar build/class/org/ibex/translators/MIPSApps.class
+build/JVM/ibex.jar: .compile build/res/builtin.jar build/class/org/ibex/translators/MIPSApps.class
        @echo -e "\n\033[1marchiving         .class -> .jar:   build/JVM/ibex.jar\033[0m"
        mkdir -p build/JVM
        echo -e "Manifest-Version: 1.0\nMain-Class: org.ibex.Main\n" > build/JVM/.manifest