[gentoo-commits] proj/libbash:master commit in: /

["Petteri Räty" <betelgeuse@gentoo.org>]

commit:     0a5f9fdbd8a496963c13f20b82ae25a5a29f3cc9
Author:     Petteri Räty <petsku <AT> petteriraty <DOT> eu>
AuthorDate: Fri Mar 25 21:21:21 2011 +0000
Commit:     Petteri Räty <betelgeuse <AT> gentoo <DOT> org>
CommitDate: Fri Mar 25 21:21:21 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/libbash.git;a=commit;h=0a5f9fdb

Update ANTLR options and handling

ANTLR options are not declared in only one place. As our grammar files
generate simpler output now there's no need to raise the limits.

---
 Makefile.am |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 0d47f9d..65bd783 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -122,9 +122,11 @@ EXTRA_DIST = bashast/bashast.g \
 coding_standard.pdf: coding_standard/coding_standard.tex
 	@PDFLATEX@ coding_standard/coding_standard.tex 2&>1 > /dev/null
 
+ANTLR = @JAVA@ -classpath @antlr_cp@ org.antlr.Tool
+
 cgrammar.run: bashast.g
 	touch $@.tmp
-	@JAVA@ -classpath @antlr_cp@ -Xmx1024m org.antlr.Tool -Xconversiontimeout 20000 -fo . $<
+	$(ANTLR) -fo . $<
 	mv $@.tmp $@
 
 bashast.g: bashast/bashast.g
@@ -134,7 +136,7 @@ bashast.g: bashast/bashast.g
 # starts with libbash_ will be stripped
 walker.run: bashast/bashwalker.g cgrammar.run
 	touch $@.tmp
-	@JAVA@ -classpath @antlr_cp@ -Xmx1024m org.antlr.Tool -Xconversiontimeout 20000 -fo . $<
+	$(ANTLR) -fo . $<
 	sed -i -e 's/\(libbash_.*\) = NULL/\1/' bashwalker.c
 	mv $@.tmp $@
 
@@ -146,7 +148,7 @@ $(GENERATED_WALKER_H): walker.run
 
 bashast/javagrammar.run: bashast/bashast.g
 	touch $@.tmp
-	@JAVA@ -classpath @antlr_cp@ -Xmx1024m org.antlr.Tool -Xconversiontimeout 20000 -fo bashast $<
+	$(ANTLR) -fo bashast $<
 	mv $@.tmp $@
 
 $(check_JAVA): bashast/javagrammar.run