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 ) id 1Q09kv-0005NQ-Nx for garchives@archives.gentoo.org; Thu, 17 Mar 2011 09:44:34 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 19826E0478; Thu, 17 Mar 2011 09:44:27 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id DFD14E0478 for ; Thu, 17 Mar 2011 09:44:26 +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 7010C1B4051 for ; Thu, 17 Mar 2011 09:44:26 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id C5BB38006E for ; Thu, 17 Mar 2011 09:44:25 +0000 (UTC) From: "Petteri Räty" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Petteri Räty" Message-ID: <6e3a2be9506cec19353ef890bc765ae3ec64c8eb.betelgeuse@gentoo> Subject: [gentoo-commits] proj/libbash:master commit in: / X-VCS-Repository: proj/libbash X-VCS-Files: .gitignore Makefile.am X-VCS-Directories: / X-VCS-Committer: betelgeuse X-VCS-Committer-Name: Petteri Räty X-VCS-Revision: 6e3a2be9506cec19353ef890bc765ae3ec64c8eb Date: Thu, 17 Mar 2011 09:44:25 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: ae20a6f23f60f748725c9ef80a7f4bbb commit: 6e3a2be9506cec19353ef890bc765ae3ec64c8eb Author: Petteri R=C3=A4ty petteriraty eu> AuthorDate: Sat Mar 12 14:52:23 2011 +0000 Commit: Petteri R=C3=A4ty gentoo org> CommitDate: Sat Mar 12 16:33:36 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/libbash.git;a= =3Dcommit;h=3D6e3a2be9 Fix make distcheck --- .gitignore | 1 + Makefile.am | 26 +++++++++++++++++++------- 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 63a1f7a..3966268 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,7 @@ .deps .libs .dirstamp +*.tar.gz classcheck.stamp Makefile.in aclocal.m4 diff --git a/Makefile.am b/Makefile.am index f262751..8e1ed45 100644 --- a/Makefile.am +++ b/Makefile.am @@ -23,7 +23,7 @@ include doxygen.am ACLOCAL_AMFLAGS =3D -I m4 =20 TEST_EXTENSIONS=3D .gunit -GUNIT_LOG_COMPILER =3D bashast/gunit/runtests.sh +GUNIT_LOG_COMPILER =3D $(srcdir)/bashast/gunit/runtests.sh AM_GUNIT_LOG_FLAGS =3D @antlr_cp@:. GUNIT_TESTS =3D bashast/gunit/arith_main.gunit \ bashast/gunit/array.gunit \ @@ -70,18 +70,30 @@ AM_CXXFLAGS=3D$(BOOST_CPPFLAGS) -std=3Dc++0x =20 GENERATED_C =3D bashastLexer.c bashastParser.c GENERATED_H =3D bashastLexer.h bashastParser.h -CLEANFILES =3D $(GENERATED_C) $(GENERATED_H) bashast.g $(check_JAVA) bas= hast/grammar.run grammar.run +CLEANFILES =3D $(GENERATED_C) \ + $(GENERATED_H) \ + bashast.g \ + $(check_JAVA) \ + bashast/grammar.run \ + grammar.run \ + bashast/bashast.tokens \ + bashast.tokens lib_LTLIBRARIES =3D libcppbash.la -libcppbash_la_SOURCES =3D src/cppbash_builtin.cpp -libcppbash_la_SOURCES +=3D src/builtins/echo_builtin.cpp -libcppbash_la_SOURCES +=3D $(GENERATED_C) +libcppbash_la_SOURCES =3D src/cppbash_builtin.cpp \ + src/cppbash_builtin.h \ + src/builtins/echo_builtin.cpp \ + src/builtins/echo_builtin.h \ + src/builtins/boolean_builtins.h \ + $(GENERATED_C) libcppbash_la_CPPFLAGS =3D $(BOOST_CPPFLAGS) =20 +EXTRA_DIST =3D bashast/bashast.g $(GUNIT_TESTS) $(GUNIT_LOG_COMPILER) + coding_standard.pdf: coding_standard/coding_standard.tex @PDFLATEX@ coding_standard/coding_standard.tex 2&>1 > /dev/null =20 grammar.run: bashast.g - @JAVA@ -classpath @antlr_cp@ -Xmx1024m org.antlr.Tool -Xconversiontimeo= ut 20000 $< + @JAVA@ -classpath @antlr_cp@ -Xmx1024m org.antlr.Tool -Xconversiontimeo= ut 20000 -fo . $< touch $@ =20 $(GENERATED_C): grammar.run @@ -91,7 +103,7 @@ bashast.g: bashast/bashast.g sed -e 's/CommonTree/pANTLR3_BASE_TREE/g' -e 's/Java/C/g' $< > $@ =20 bashast/grammar.run: bashast/bashast.g - @JAVA@ -classpath @antlr_cp@ -Xmx1024m org.antlr.Tool -Xconversiontimeo= ut 20000 $< + @JAVA@ -classpath @antlr_cp@ -Xmx1024m org.antlr.Tool -Xconversiontimeo= ut 20000 -fo bashast $< touch $@ =20 $(check_JAVA): bashast/grammar.run