public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Petteri Räty" <betelgeuse@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/libbash:master commit in: /
Date: Thu, 17 Mar 2011 09:44:25 +0000 (UTC)	[thread overview]
Message-ID: <6e3a2be9506cec19353ef890bc765ae3ec64c8eb.betelgeuse@gentoo> (raw)

commit:     6e3a2be9506cec19353ef890bc765ae3ec64c8eb
Author:     Petteri Räty <petsku <AT> petteriraty <DOT> eu>
AuthorDate: Sat Mar 12 14:52:23 2011 +0000
Commit:     Petteri Räty <betelgeuse <AT> gentoo <DOT> org>
CommitDate: Sat Mar 12 16:33:36 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/libbash.git;a=commit;h=6e3a2be9

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 = -I m4
 
 TEST_EXTENSIONS= .gunit
-GUNIT_LOG_COMPILER = bashast/gunit/runtests.sh
+GUNIT_LOG_COMPILER = $(srcdir)/bashast/gunit/runtests.sh
 AM_GUNIT_LOG_FLAGS = @antlr_cp@:.
 GUNIT_TESTS = bashast/gunit/arith_main.gunit \
 		bashast/gunit/array.gunit \
@@ -70,18 +70,30 @@ AM_CXXFLAGS=$(BOOST_CPPFLAGS) -std=c++0x
 
 GENERATED_C = bashastLexer.c bashastParser.c
 GENERATED_H = bashastLexer.h bashastParser.h
-CLEANFILES = $(GENERATED_C) $(GENERATED_H) bashast.g $(check_JAVA) bashast/grammar.run grammar.run
+CLEANFILES = $(GENERATED_C) \
+			 $(GENERATED_H) \
+			 bashast.g \
+			 $(check_JAVA) \
+			 bashast/grammar.run \
+			 grammar.run \
+			 bashast/bashast.tokens \
+			 bashast.tokens
 lib_LTLIBRARIES = libcppbash.la
-libcppbash_la_SOURCES = src/cppbash_builtin.cpp
-libcppbash_la_SOURCES += src/builtins/echo_builtin.cpp
-libcppbash_la_SOURCES += $(GENERATED_C)
+libcppbash_la_SOURCES = 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 = $(BOOST_CPPFLAGS)
 
+EXTRA_DIST = 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
 
 grammar.run: bashast.g
-	@JAVA@ -classpath @antlr_cp@ -Xmx1024m org.antlr.Tool -Xconversiontimeout 20000 $<
+	@JAVA@ -classpath @antlr_cp@ -Xmx1024m org.antlr.Tool -Xconversiontimeout 20000 -fo . $<
 	touch $@
 
 $(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' $< > $@
 
 bashast/grammar.run: bashast/bashast.g
-	@JAVA@ -classpath @antlr_cp@ -Xmx1024m org.antlr.Tool -Xconversiontimeout 20000 $<
+	@JAVA@ -classpath @antlr_cp@ -Xmx1024m org.antlr.Tool -Xconversiontimeout 20000 -fo bashast $<
 	touch $@
 
 $(check_JAVA): bashast/grammar.run



             reply	other threads:[~2011-03-17  9:44 UTC|newest]

Thread overview: 60+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-03-17  9:44 Petteri Räty [this message]
  -- strict thread matches above, loose matches on Subject: below --
2012-08-19 14:54 [gentoo-commits] proj/libbash:master commit in: / Petteri Räty
2012-06-03  9:08 Petteri Räty
2011-08-04 14:24 Petteri Räty
2011-08-04 14:24 Petteri Räty
2011-08-04 14:24 Petteri Räty
2011-08-04 14:24 Petteri Räty
2011-08-04 14:24 Petteri Räty
2011-08-04 14:24 Petteri Räty
2011-08-04 13:53 Petteri Räty
2011-07-20 14:01 Petteri Räty
2011-07-08 14:03 Petteri Räty
2011-07-08 14:03 Petteri Räty
2011-07-03 20:21 Petteri Räty
2011-06-26 13:38 Petteri Räty
2011-06-26 13:38 Petteri Räty
2011-06-25 10:30 Petteri Räty
2011-06-25 10:05 Petteri Räty
2011-06-16 16:53 Petteri Räty
2011-06-11  8:52 Petteri Räty
2011-06-11  8:52 Petteri Räty
2011-06-11  8:24 Petteri Räty
2011-06-03 14:48 Petteri Räty
2011-06-03 12:43 Petteri Räty
2011-05-27 23:03 Petteri Räty
2011-05-24 14:50 Petteri Räty
2011-05-14 14:58 Petteri Räty
2011-05-14 14:58 Petteri Räty
2011-05-12 14:06 Petteri Räty
2011-05-11  7:19 Petteri Räty
2011-05-08 13:07 Petteri Räty
2011-05-07 12:25 Petteri Räty
2011-04-27 15:11 Petteri Räty
2011-04-20 11:26 Petteri Räty
2011-04-17 10:58 Petteri Räty
2011-04-14  4:50 Petteri Räty
2011-04-14  4:50 Petteri Räty
2011-04-12 18:29 Petteri Räty
2011-04-11  6:50 Petteri Räty
2011-04-09 13:08 Petteri Räty
2011-04-08 11:12 Petteri Räty
2011-04-07 16:44 Petteri Räty
2011-04-03 13:46 Petteri Räty
2011-04-03 13:46 Petteri Räty
2011-04-02 15:50 Petteri Räty
2011-03-30 12:48 Petteri Räty
2011-03-27  8:56 Petteri Räty
2011-03-26 19:08 Petteri Räty
2011-03-26 19:08 Petteri Räty
2011-03-26 12:24 Petteri Räty
2011-03-26 12:24 Petteri Räty
2011-03-26 12:24 Petteri Räty
2011-03-26 12:24 Petteri Räty
2011-03-26 12:24 Petteri Räty
2011-03-26 12:24 Petteri Räty
2011-03-26 12:24 Petteri Räty
2011-03-26 12:24 Petteri Räty
2011-03-25 12:11 Petteri Räty
2011-03-12 11:53 Petteri Räty
2011-03-06 12:05 Petteri Räty

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=6e3a2be9506cec19353ef890bc765ae3ec64c8eb.betelgeuse@gentoo \
    --to=betelgeuse@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox