From 5cd62667d09b2caa9bee01019cea3d42f0fcf857 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Sat, 25 Dec 2004 23:10:06 +0000 Subject: * lib/Makefile.am (JAVAC): Handle GCJX. (GCJ): Removed. (JIKES): Likewise. (USER_JABBA): Likewise. (USER_JAVAH): Likewise. (FIND): Likewise. (USER_CLASSLIB): Likewise. * examples/Makefile.am (JCOMPILER): Handle gcjx. (GCJ): Removed. (JIKES): Likewise. * acinclude.m4 (CLASSPATH_WITH_GCJX): New macro. (CLASSPATH_CHECK_GCJX): Likewise. (CLASSPATH_FIND_JAVAC): Use it. --- examples/Makefile.am | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'examples') diff --git a/examples/Makefile.am b/examples/Makefile.am index a4cd8e234..afe19ea06 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -1,17 +1,19 @@ ## Input file for automake to generate the Makefile.in used by configure # Setup the compiler to use the GNU Classpath library we just build -GCJ = @GCJ@ -JIKES = @JIKES@ if FOUND_GCJ JCOMPILER = $(GCJ) --bootclasspath '$(top_builddir)/lib' --classpath . -C else if FOUND_JIKES JCOMPILER = $(JIKES) -bootclasspath '' -extdirs '' -sourcepath '' --classpath $(top_builddir)/lib:. else +if FOUND_GCJX +JCOMPILER = $(GCJX) -bootclasspath '' -sourcepath '' -classpath $(top_builddir)/lib:. +else error dunno how to setup the JCOMPILER and compile endif endif +endif # All our example java source files EXAMPLE_JAVA_FILES = $(srcdir)/gnu/classpath/examples/*/*.java -- cgit v1.2.1