more uniorm handling of javac

[org.ibex.core.git] / Makefile

diff --git a/Makefile b/Makefile
index 35c582e..4779d99 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -54,7 +54,6 @@ target_bin_extension_Java2       := jar
 target_bin_extension             := $(target_bin_extension_$(platform))
 target_bin                       := ibex.$(target_bin_extension)
 
-javac   := javac -classpath upstream/bcel-5.1/src/bcel-5.1.jar:build/class -d build/class/ -sourcepath build/java/:upstream/mips:upstream/mips/build:src
 gcc_optimizations  := -Os
 #gcc_optimizations  := -O9 -ffast-math -fomit-frame-pointer -foptimize-sibling-calls
 #gcc_optimizations  += -finline-functions -funroll-loops -ffunction-sections -fdata-sections
@@ -69,6 +68,11 @@ g++                := upstream/install/bin/$(target)-gcj $(gcc_flags) -Iupstream
 gcc                := upstream/install/bin/$(target)-gcc $(gcc_flags)
 nm                 := upstream/install/$(target)/bin/nm
 jar                := $(shell ((type fastjar &>/dev/null) && echo fastjar) || echo jar)
+ifeq ($(platform),Java2)
+javac   := javac -classpath upstream/bcel-5.1/src/bcel-5.1.jar   -d build/class/ -sourcepath build/java/
+else
+javac   := $(gcj) -fCLASSPATH=upstream/bcel-5.1/src/bcel-5.1.jar -d build/class/          -Ibuild/java -Iupstream/gnu.regexp-1.1.4/src/src -C
+endif
 
 gcj: .install_gcc-3.3_$(target)
        @make build/$(platform)/$(target_bin) link_flags="$(link_flags)" platform=$(platform)
@@ -110,6 +114,8 @@ java_sources              += build/java/org/xwt/mips/UsermodeConstants.java
 java_classes              := $(java_sources:build/java/%.java=build/class/%.class)
 java_classes              += build/class/gnu/regexp/CharUnit.class build/class/gnu/regexp/IntPair.class
 
+.PRECIOUS: $(java_classes) $(java_sources) *.java
+
 ### Java Source Files ##############################################################################
 
 build/java/gnu/regexp: .download_gnu.regexp-1.1.4