X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=9620e928cb09d198bcc99a49b88b923e29a5d062;hb=83db7f387cbf85bee0cd4b9390af723d4e52e351;hp=d89b3296bad8d7bcc134cb72ca89642a9522d779;hpb=ef41f45f245c8673f2a3648967c9d42a4c9c3184;p=org.ibex.core.git

diff --git a/Makefile b/Makefile
index d89b329..9620e92 100644
--- a/Makefile
+++ b/Makefile
@@ -47,28 +47,25 @@ include Makefile.upstream
 
 # figure out what stuff in org.xwt.plat.* this platform requires (its superclasses)
 all_java_sources  := $(patsubst src/%.java,     build/java/%.java, $(shell find src -name '*.java'))
-all_java_sources  += $(patsubst src/%.java.pp,  build/java/%.java, $(shell find src -name '*.java.pp'))
 
 java_sources      := $(all_java_sources)
 nonplat_java_sources      := $(filter-out build/java/org/xwt/plat/%, $(all_java_sources))
 plat_java_sources      := $(filter build/java/org/xwt/plat/%, $(all_java_sources))
 
+build/java/org/xwt/%.java: src/org/xwt/%.java
+	make build/class/org/xwt/util/Preprocessor.class
+	@echo -e "\n\033[1mpreprocessing      .java -> .java:  $<\033[0m"
+	mkdir -p `dirname $@`; java -cp build/class org.xwt.util.Preprocessor < $< > $@
 build/java/%.java: src/%.java ; @echo linking $@; mkdir -p $(@D); ln -fs `echo $(@D)/ | sed 's_[^/]*//*_../_g'`/$< $@
+
 build/cc/%.cc:     src/%.c    ; @echo linking $@; mkdir -p $(@D); ln -fs `echo $(@D)/ | sed 's_[^/]*//*_../_g'`/$< $@
 build/c/jpeg/%.c:     upstream/jpeg-6b/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/%.java: src/%.java.pp
-	make build/class/org/xwt/util/Preprocessor.class
-	@echo -e "\n\033[1mpreprocessing   .java.pp -> .java:  $<\033[0m"
-	mkdir -p `dirname $@`
-	rm -f $@
-	java -cp build/class org.xwt.util.Preprocessor < $< > $@
-
-build/class/%.class: build/java/%.java .jikes
+build/class/org/xwt/util/Preprocessor.class: src/org/xwt/util/Preprocessor.java .jikes
 	@echo -e "\n\033[1mcompiling          .java -> .class: $<\033[0m"
-	mkdir -p build/class
+	mkdir -p build/class/org/xwt/util/
 	./.jikes $<
 
 # this forces a clean build every time because jikes is so damn buggy
@@ -323,3 +320,4 @@ dist-private:
 test: JVM; /System/Library/Frameworks/JavaVM.framework/Versions/1.3.1/Commands/java -jar build/JVM/xwt.jar http://localhost/demo.xwar
 #test: JVM; java -jar build/JVM/xwt.jar http://localhost/demo.xwar
 
+oldcompile: ; CLASSPATH=$$CLASSPATH:lib/libgcj-minimal.jar javac -d build/class `find build/java/ -name \*.java`