Merge remote-tracking branch 'origin/maint'

[bison.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 6220276f77722a741b0d1e17d688e2ab6005235e..5fae4ce5848de9bf82f02b9518707a15eeda4c91 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,20 +1,21 @@
-## Process this file with automake to produce Makefile.in -*-Makefile-*-
+## Process this file with automake to produce Makefile.in.
 
-## Copyright (C) 2001-2012 Free Software Foundation, Inc.
-
-## This program is free software: you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation, either version 3 of the License, or
-## (at your option) any later version.
-##
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-## GNU General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+AUTOMAKE_OPTIONS = subdir-objects
 ACLOCAL_AMFLAGS = -I m4
 
 SUBDIRS = po runtime-po .
@@ -27,20 +28,28 @@ EXTRA_DIST = .prev-version .version \
   cfg.mk ChangeLog-1998 ChangeLog-2012 PACKAGING
 
 ## Running the bison from this tarball.  To generate our own parser,
-## but also to run the tests.
+## but also to run the tests.  Of course, you ought to keep a sane
+## version of Bison nearby...
 BISON = $(top_builddir)/tests/bison
 BISON_IN = $(top_srcdir)/tests/bison.in
+YACC = $(BISON) -y
+AM_YFLAGS = -d -v --warnings=all,error --report=all
 
 # Initialization before completion by local.mk's.
 AM_CFLAGS = $(WARN_CFLAGS)
 # Find builddir/src/scan-code.c etc.
 AM_CPPFLAGS = -I. -Ilib -I$(top_srcdir) -I$(top_srcdir)/lib
 BUILT_SOURCES =
+CLEANFILES =
 DISTCLEANFILES =
+EXTRA_DIST += $(dist_TESTS)
+MOSTLYCLEANDIRS =
 MOSTLYCLEANFILES =
 SUFFIXES =
+TESTS = $(dist_TESTS)
+check_PROGRAMS =
+dist_TESTS =
 noinst_LIBRARIES =
-MOSTLYCLEANDIRS =
 
 include build-aux/local.mk
 include data/local.mk
@@ -79,11 +88,13 @@ update-package-copyright-year:
 gen_start_date = 2012-01-16
 .PHONY: gen-ChangeLog
 gen-ChangeLog:
-       $(AM_V_GEN)if test -d .git; then                                \
-         $(top_srcdir)/build-aux/gitlog-to-changelog                   \
-           --no-cluster                                                \
-           --amend=$(srcdir)/build-aux/git-log-fix                     \
-           --since=$(gen_start_date) > $(distdir)/cl-t;                \
-         rm -f $(distdir)/ChangeLog;                                   \
-         mv $(distdir)/cl-t $(distdir)/ChangeLog;                      \
+       $(AM_V_GEN)if test -d $(srcdir)/.git; then              \
+         $(top_srcdir)/build-aux/gitlog-to-changelog           \
+           --strip-tab                                         \
+           --strip-cherry-picked                               \
+           --no-cluster                                        \
+           --amend=$(srcdir)/build-aux/git-log-fix             \
+           --since=$(gen_start_date) > $(distdir)/cl-t;        \
+         rm -f $(distdir)/ChangeLog;                           \
+         mv $(distdir)/cl-t $(distdir)/ChangeLog;              \
        fi