From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from <gentoo-commits+bounces-329629-garchives=archives.gentoo.org@lists.gentoo.org>) id 1Q3SXr-0006Bs-Mq for garchives@archives.gentoo.org; Sat, 26 Mar 2011 12:24:43 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1B3961C013; Sat, 26 Mar 2011 12:24:12 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id DF24A1C017 for <gentoo-commits@lists.gentoo.org>; Sat, 26 Mar 2011 12:24:11 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3AF4F1B4115 for <gentoo-commits@lists.gentoo.org>; Sat, 26 Mar 2011 12:24:11 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 5700A80075 for <gentoo-commits@lists.gentoo.org>; Sat, 26 Mar 2011 12:24:10 +0000 (UTC) From: "Petteri Räty" <betelgeuse@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Petteri Räty" <betelgeuse@gentoo.org> Message-ID: <0a5f9fdbd8a496963c13f20b82ae25a5a29f3cc9.betelgeuse@gentoo> Subject: [gentoo-commits] proj/libbash:master commit in: / X-VCS-Repository: proj/libbash X-VCS-Files: Makefile.am X-VCS-Directories: / X-VCS-Committer: betelgeuse X-VCS-Committer-Name: Petteri Räty X-VCS-Revision: 0a5f9fdbd8a496963c13f20b82ae25a5a29f3cc9 Date: Sat, 26 Mar 2011 12:24:10 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 08580c267422862cb6a6c0642278f5e7 commit: 0a5f9fdbd8a496963c13f20b82ae25a5a29f3cc9 Author: Petteri R=C3=A4ty <petsku <AT> petteriraty <DOT> eu> AuthorDate: Fri Mar 25 21:21:21 2011 +0000 Commit: Petteri R=C3=A4ty <betelgeuse <AT> gentoo <DOT> org> CommitDate: Fri Mar 25 21:21:21 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/libbash.git;a= =3Dcommit;h=3D0a5f9fdb 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 =3D bashast/bashast.g \ coding_standard.pdf: coding_standard/coding_standard.tex @PDFLATEX@ coding_standard/coding_standard.tex 2&>1 > /dev/null =20 +ANTLR =3D @JAVA@ -classpath @antlr_cp@ org.antlr.Tool + cgrammar.run: bashast.g touch $@.tmp - @JAVA@ -classpath @antlr_cp@ -Xmx1024m org.antlr.Tool -Xconversiontimeo= ut 20000 -fo . $< + $(ANTLR) -fo . $< mv $@.tmp $@ =20 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 -Xconversiontimeo= ut 20000 -fo . $< + $(ANTLR) -fo . $< sed -i -e 's/\(libbash_.*\) =3D NULL/\1/' bashwalker.c mv $@.tmp $@ =20 @@ -146,7 +148,7 @@ $(GENERATED_WALKER_H): walker.run =20 bashast/javagrammar.run: bashast/bashast.g touch $@.tmp - @JAVA@ -classpath @antlr_cp@ -Xmx1024m org.antlr.Tool -Xconversiontimeo= ut 20000 -fo bashast $< + $(ANTLR) -fo bashast $< mv $@.tmp $@ =20 $(check_JAVA): bashast/javagrammar.run