X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=7d051c026d997bf8472899196d3049091bc5d58e;hb=6833b92bd60998e0c08a9e4f83dbc2712faa8aa3;hp=593bb6dc226c8392e9df0621a67d514ed93e2eb3;hpb=a5badea1a13725a5ab1294c9b2e6ac9ea8be82c1;p=org.ibex.core.git

diff --git a/Makefile b/Makefile
index 593bb6d..7d051c0 100644
--- a/Makefile
+++ b/Makefile
@@ -10,8 +10,10 @@ jpeg_c_sources += jdhuff.c jdphuff.c jddctmgr.c jidctint.c jidctfst.c jidctflt.c
 jpeg_c_sources += jquant1.c jquant2.c jerror.c jutils.c jmemnobs.c jmemmgr.c
 
 # inputs
+java_pp_sources        := $(shell find src -name \*.java.pp)
+java_pp_postproc       := $(java_pp_sources:src/%.java.pp=bin/%.java)
 java_sources           := $(shell find src -name \*.java)
-java_headers           := $(java_sources:src/%.java=bin/%.h)
+java_headers           := $(java_sources:src/%.java=bin/%.h) $(java_pp_postproc:bin/%.java=bin/%.h)
 xwar_sources           := $(shell ls src/org/xwt/builtin/*.png src/org/xwt/builtin/*.xwt src/org/xwt/builtin/*.xwf)
 cc_sources             := src/org/xwt/plat/$(platform).cc
 c_sources              := $(jpeg_c_sources:%.c=src/org/ijg/%.c)
@@ -24,6 +26,7 @@ freetype_sources       += $(freetype_other_sources:%=gcc/src/freetype-2.1.4/src/
 
 # outputs
 java_objects           := $(filter-out bin-$(platform)/org/xwt/plat/%, $(java_sources:src/%.java=bin-$(platform)/%.java.o))
+java_objects           += $(filter-out bin-$(platform)/org/xwt/plat/%, $(java_pp_postproc:bin/%.java=bin-$(platform)/%.java.o))
 java_objects           += bin-$(platform)/org/xwt/plat/GCJ.java.o
 java_objects           += $(platform_java_sources:%=bin-$(platform)/org/xwt/plat/%.java.o)
 cc_objects             := $(cc_sources:src/%.cc=bin-$(platform)/%.cc.o)
@@ -62,14 +65,22 @@ ifneq ($(verbose),true)
 silent := --silent
 endif
 
+compile: .javac $(java_pp_postproc) bin/org/xwt/builtin.xwar
+	echo "compiling          .java -> .class:"
+	mkdir -p bin
+	$(shell cat .javac) -classpath lib/libgcj-minimal.jar $(java_sources) $(java_pp_postproc) -d bin/ 2>&1 | \
+		grep -v ^\\[read | sed s_^\\[write\ bin/__ | sed s_.class\\]_.java_ | sed "s_^_compiling          .java -> .class: src/_"
 
-# preprocessing: use m4 -P
-
-compile: .javac bin/org/xwt/builtin.xwar
-	echo "compiling   .java -> .class:"
+bin/org/xwt/util/Preprocessor.class: .javac
+	echo "compiling preprocessor"
 	mkdir -p bin
-	$(shell cat .javac) -classpath lib/libgcj-minimal.jar $(java_sources) -d bin/ 2>&1 | \
-		grep -v ^\\[read | sed s_^\\[write\ bin/__ | sed s_.class\\]_.java_ | sed "s_^_compiling   .java -> .class: src/_"
+	$(shell cat .javac) -classpath lib/libgcj-minimal.jar src/org/xwt/util/Preprocessor.java -d bin/ 2>&1 | \
+		grep -v ^\\[read | sed s_^\\[write\ bin/__ | sed s_.class\\]_.java_ | sed "s_^_compiling          .java -> .class: src/_"
+
+$(java_pp_postproc): bin/%.java: src/%.java.pp bin/org/xwt/util/Preprocessor.class
+	@echo "preprocessing   .java.pp -> .java:     $<"
+	@mkdir -p `dirname $@`
+	@java -cp bin org.xwt.util.Preprocessor < $< > $@
 
 # platforms
 all: Win32 Linux Java2 #Solaris
@@ -170,11 +181,11 @@ freetype.mips: gcc/src/.freetype
 gcj: $(gcc_path)/bin/$(target)-gcj compile $(target_bin)
 
 $(target_bin): $(java_objects) $(cc_objects) $(c_objects) bin-$(platform)/org/xwt/builtin.o
-	@echo "linking        .o -> $(target_bin)"
+	@echo "linking               .o -> $(target_bin)"
 	$(gcj) --main=org.xwt.Main -o bin-$(platform)/$(target_bin) $^ $(platform_link) 
 
 bin-$(platform)/org/xwt/builtin.o: bin/org/xwt/builtin.xwar
-	@echo "wrapping    .xwar -> .o:     bin/org/xwt/builtin.o"
+	@echo "wrapping           .xwar -> .o:     bin/org/xwt/builtin.o"
 	@(echo "unsigned int builtin_xwar_length = ";\
 	  (wc -c bin/org/xwt/builtin.xwar | sed "s_bin.*__");\
 	  echo \;;\
@@ -184,13 +195,13 @@ bin-$(platform)/org/xwt/builtin.o: bin/org/xwt/builtin.xwar
 	$(gcc) -c .builtin.c -o bin-$(platform)/org/xwt/builtin.o
 
 $(java_headers): bin/%.h: bin/%.class
-	@echo "extracting .class -> .h:     $<"
+	@echo "extracting        .class -> .h:     $<"
 	cd bin; find `echo $< | sed s/.class$$// | sed s_^bin/__ `*.class |\
 		sed s_/_._g | sed s/.class$$// | sed s/.java$$// |\
 			xargs $(gcjh) --classpath .
 
 $(java_objects): bin-$(platform)/%.java.o: src/%.java
-	@echo "compiling   .java -> .o:     $<"
+	@echo "compiling          .java -> .o:     $<"
 	mkdir -p `dirname $@`
 	$(gcj) -c $< -o $@
 
@@ -203,12 +214,12 @@ src/org/ijg/jmorecfg.h: src/org/ijg/jpegsrc.v6b.tar.gz src/org/ijg/jmorecfg.h.pa
 	rm -rf src/org/ijg/jpeg-6b
 
 $(cc_objects): bin-$(platform)/%.cc.o: src/%.cc $(java_headers) src/org/ijg/jmorecfg.h
-	@echo "compiling     .cc -> .o:     $<"
+	@echo "compiling            .cc -> .o:     $<"
 	@mkdir -p `dirname $@`
 	$(g++) -I/usr/X11R6/include/ -I$(gcc_path)/include -Ibin -Iupstream/$(platform)/include -Wno-multichar -c $< -o $@
 
 $(c_objects): bin-$(platform)/%.c.o: src/%.c src/org/ijg/jmorecfg.h
-	@echo "compiling      .c -> .o:     $<"
+	@echo "compiling             .c -> .o:     $<"
 	@mkdir -p `dirname $@`
 	$(gcc) -Ibin -c $< -o $@
 
@@ -268,7 +279,7 @@ Carbon:
 
 Java2: compile bin/org/xwt/builtin.xwar
 	echo -e "\\n=== Java2 ========================================="
-	echo "archiving  .class -> .jar"
+	echo "archiving         .class -> .jar"
 	mkdir -p bin-Java2
 	echo -e "Manifest-Version: 1.0\nMain-Class: org.xwt.Main\n" > bin/.manifest
 	cd bin; $(jar) cvfm ../bin-Java2/xwt.jar .manifest \