diff options
Diffstat (limited to 'libjava/classpath/tools/Makefile.in')
-rw-r--r-- | libjava/classpath/tools/Makefile.in | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/libjava/classpath/tools/Makefile.in b/libjava/classpath/tools/Makefile.in index 34adec96db1..cf52853cc32 100644 --- a/libjava/classpath/tools/Makefile.in +++ b/libjava/classpath/tools/Makefile.in @@ -453,8 +453,7 @@ GLIBJ_CLASSPATH = .:$(srcdir)/asm:$(ANTLR_CLASSPATH) # Setup the compiler to use the GNU Classpath library we just built. @GCJ_JAVAC_TRUE@JCOMPILER = $(JAVAC) $(JAVACFLAGS) -fsource=1.5 -ftarget=1.5 --encoding=UTF-8 --bootclasspath=$(GLIBJ_BOOTCLASSPATH) --classpath=$(GLIBJ_CLASSPATH) -@CREATE_GJDOC_PARSER_FALSE@@CREATE_GJDOC_TRUE@gjdoc_gendir = ${top_srcdir}/tools/generated -@CREATE_GJDOC_PARSER_TRUE@@CREATE_GJDOC_TRUE@gjdoc_gendir = ${top_builddir}/tools/generated +@CREATE_GJDOC_TRUE@gjdoc_gendir = ${top_srcdir}/tools/generated @CREATE_GJDOC_TRUE@ANTLR_CLASSPATH = $(ANTLR_JAR):$(gjdoc_gendir) @CREATE_WRAPPERS_TRUE@bin_SCRIPTS = @CREATE_WRAPPERS_TRUE@AM_CPPFLAGS = -Wall \ @@ -1332,8 +1331,8 @@ $(TOOLS_ZIP): $(ALL_TOOLS_FILES) echo -n > vm-tools.lst; \ fi cat classes.lst asm.lst vm-tools.lst > all-classes.lst -@CREATE_GJDOC_PARSER_TRUE@@CREATE_GJDOC_TRUE@@JAVA_MAINTAINER_MODE_TRUE@ @mkdir_p@ $(srcdir)/gnu/classpath/tools/gjdoc/expr -@CREATE_GJDOC_PARSER_TRUE@@CREATE_GJDOC_TRUE@@JAVA_MAINTAINER_MODE_TRUE@ $(ANTLR) -o $(srcdir)/gnu/classpath/tools/gjdoc/expr \ +@CREATE_GJDOC_PARSER_TRUE@@CREATE_GJDOC_TRUE@@JAVA_MAINTAINER_MODE_TRUE@ @mkdir_p@ $(gjdoc_gendir)/gnu/classpath/tools/gjdoc/expr +@CREATE_GJDOC_PARSER_TRUE@@CREATE_GJDOC_TRUE@@JAVA_MAINTAINER_MODE_TRUE@ $(ANTLR) -o $(gjdoc_gendir)/gnu/classpath/tools/gjdoc/expr \ @CREATE_GJDOC_PARSER_TRUE@@CREATE_GJDOC_TRUE@@JAVA_MAINTAINER_MODE_TRUE@ $(srcdir)/gnu/classpath/tools/gjdoc/expr/java-expression.g @JAVA_MAINTAINER_MODE_TRUE@ AC=`echo $(JCOMPILER) | sed -e 's/UTF-8/ISO-8859-1/g'`; \ @JAVA_MAINTAINER_MODE_TRUE@ $$AC -g -w -d $(srcdir)/asm @asm.lst |