From: megacz <megacz@xwt.org>
Date: Fri, 30 Jan 2004 07:04:14 +0000 (+0000)
Subject: 2003/08/09 23:43:23
X-Git-Tag: RC3~751
X-Git-Url: http://git.megacz.com/?p=org.ibex.core.git;a=commitdiff_plain;h=a5badea1a13725a5ab1294c9b2e6ac9ea8be82c1

2003/08/09 23:43:23

darcs-hash:20040130070414-2ba56-9d8f36ee4c64c3bb28eef72538c0883a1ec9d76b.gz
---

diff --git a/Makefile b/Makefile
index fc8ade5..593bb6d 100644
--- a/Makefile
+++ b/Makefile
@@ -62,7 +62,10 @@ ifneq ($(verbose),true)
 silent := --silent
 endif
 
-compile: .javac .bootclasspath bin/org/xwt/builtin.xwar
+
+# preprocessing: use m4 -P
+
+compile: .javac bin/org/xwt/builtin.xwar
 	echo "compiling   .java -> .class:"
 	mkdir -p bin
 	$(shell cat .javac) -classpath lib/libgcj-minimal.jar $(java_sources) -d bin/ 2>&1 | \
@@ -73,19 +76,19 @@ all: Win32 Linux Java2 #Solaris
 
 .javac:
 	@if \
-	@	type jikes && (jikes --version | grep "Version 1.18"); \
-	@then \
-	@	echo "public class GetBootClassPath { public static void main(String[] s) { " > GetBootClassPath.java; \
-	@	echo "System.out.println(System.getProperty(\"sun.boot.class.path\")); } }" >> GetBootClassPath.java; \
-	@	javac GetBootClassPath.java; \
-	@	java -cp . GetBootClassPath > .bootclasspath; \
-	@	rm GetBootClassPath.*; \
-	@	echo -n "jikes -nowarn -sourcepath src/ -bootclasspath " > .javac; \
-	@	cat .bootclasspath >> .javac; \
-	@else \
-	@	echo "WARNING: You do not have jikes; falling back to javac.  Compiles will be very slow."; \
-	@	echo javac > .javac; \
-	@fi
+		type jikes && (jikes --version | grep "Version 1.18"); \
+	then \
+		echo "public class GetBootClassPath { public static void main(String[] s) { " > GetBootClassPath.java; \
+		echo "System.out.println(System.getProperty(\"sun.boot.class.path\")); } }" >> GetBootClassPath.java; \
+		javac GetBootClassPath.java; \
+		java -cp . GetBootClassPath > .bootclasspath; \
+		rm GetBootClassPath.*; \
+		echo -n "jikes -nowarn -sourcepath src/ -bootclasspath " > .javac; \
+		cat .bootclasspath >> .javac; \
+	else \
+		echo "WARNING: You do not have jikes; falling back to javac.  Compiles will be very slow."; \
+		echo javac > .javac; \
+	fi
 
 jikes:
 	curl ftp://www-126.ibm.com/pub/jikes/1.18/jikes-1.18.tar.bz2 | tar xjvf -