diff options
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2008-10-05 21:19:16 +0000 |
|---|---|---|
| committer | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2008-10-05 21:19:16 +0000 |
| commit | cae9a32cbcc4c133301d64f49d36709ccbc994da (patch) | |
| tree | 2c41753d6c88c8b8817cc0a811bb7c0801ec9f02 /tools | |
| parent | e93c4ea50e2390957e16c1d4c8de76de1666725f (diff) | |
| download | classpath-cae9a32cbcc4c133301d64f49d36709ccbc994da.tar.gz | |
Add -regen-gjdoc-parser option.
2008-10-02 Andrew John Hughes <gnu_andrew@member.fsf.org>
* configure.ac:
Add regen-gjdoc-parser option,
and separate antlr tests.
* m4/ac_prog_antlr.m4:
Turn single test into AC_LIB_ANTLR
and AC_PROG_ANTLR.
* m4/ac_prog_java.m4:
Quote tests.
* tools/Makefile.am:
Support CREATE_GJDOC_PARSER option.
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/Makefile.am | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/tools/Makefile.am b/tools/Makefile.am index e39c3b466..30c9be6d8 100755 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -1,7 +1,12 @@ ## Input file for automake to generate the Makefile.in used by configure if CREATE_GJDOC -ANTLR_CLASSPATH = $(ANTLR_JAR):generated +if CREATE_GJDOC_PARSER +gjdoc_gendir = ${top_builddir}/tools/generated +else +gjdoc_gendir = ${top_srcdir}/tools/generated +endif +ANTLR_CLASSPATH = $(ANTLR_JAR):$(gjdoc_gendir) endif GLIBJ_BOOTCLASSPATH='$(top_builddir)/lib/glibj.zip:$(top_builddir)/lib' @@ -306,9 +311,9 @@ dist-hook: # immediately. And copy the template files we use to the classes dir # so they get also included. $(TOOLS_ZIP): $(ALL_TOOLS_FILES) - @rm -rf classes asm generated + @rm -rf classes asm @mkdir_p@ classes asm -if CREATE_GJDOC +if CREATE_GJDOC_PARSER ## Generate antlr sources. @mkdir_p@ generated/gnu/classpath/tools/gjdoc/expr $(ANTLR) -o generated/gnu/classpath/tools/gjdoc/expr \ @@ -368,7 +373,10 @@ endif # Zip file be gone! (and make sure the classes are gone too) clean-local: - rm -rf $(TOOLS_ZIP) classes classes.lst asm asm.lst all-classes.lst generated + rm -rf $(TOOLS_ZIP) classes classes.lst asm asm.lst all-classes.lst +if CREATE_GJDOC_PARSER + rm -rf $(gjdoc_gendir) +endif # FIXME: remove this when GNU Classpath includes a bootstrap VM. installcheck-binSCRIPTS: |