lalr1.cc: fix the support of YYERROR with variants

[bison.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 5840e4abd2bf810e9581b8b57f7d8c4c9a414578..339a3c63ae4eb14b0fd645b2a64b0cdc51963101 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
-## Process this file with automake to produce Makefile.in -*-Makefile-*-
-## Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software
-## Foundation, Inc.
+## Process this file with automake to produce Makefile.in.
 
+# Copyright (C) 2001-2013 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
@@ -15,43 +15,51 @@
 # 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 lib . tests
-if BISON_CXX_WORKS
-SUBDIRS += examples/calc++
-endif
+SUBDIRS = po runtime-po .
 
 # Files installed for use by Automake.
 aclocaldir = @aclocaldir@
 aclocal_DATA = m4/bison-i18n.m4
 
 EXTRA_DIST = .prev-version .version \
-  cfg.mk maint.mk \
-  OChangeLog PACKAGING
+  cfg.mk ChangeLog-1998 ChangeLog-2012 PACKAGING
+
+## Running the bison from this tarball.  To generate our own parser,
+## 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) -o y.tab.c
+AM_YFLAGS = -d -v -Werror -Wall -Wno-yacc --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 =
+
 include build-aux/local.mk
 include data/local.mk
 include djgpp/local.mk
 include doc/local.mk
 include etc/local.mk
 include examples/local.mk
+include lib/local.mk
 include src/local.mk
-
-.PHONY: maintainer-check
-maintainer-check:
-       cd tests && $(MAKE) $(AM_MAKEFLAGS) $@
-
-.PHONY: maintainer-push-check
-maintainer-push-check:
-       cd tests && $(MAKE) $(AM_MAKEFLAGS) $@
-
-.PHONY: maintainer-xml-check
-maintainer-xml-check:
-       cd tests && $(MAKE) $(AM_MAKEFLAGS) $@
+include tests/local.mk
 
 # See comments in build-aux/git-version-gen.  However, we make .version depend
 # on configure so that .version and VERSION/PACKAGE_VERSION stay in sync in the
@@ -65,5 +73,29 @@ maintainer-xml-check:
 BUILT_SOURCES += $(top_srcdir)/.version
 $(top_srcdir)/.version: configure
        echo $(VERSION) > $@-t && mv $@-t $@
-dist-hook:
+dist-hook: gen-ChangeLog
        echo $(VERSION) > $(distdir)/.tarball-version
+
+.PHONY: update-b4-copyright update-package-copyright-year
+update-b4-copyright:
+       $(AM_V_GEN)find $(srcdir)/data -type f          \
+         | xargs $(srcdir)/build-aux/$@
+       @echo 'warning: src/parse-gram.[hc] may need to be regenerated.'
+update-package-copyright-year:
+       $(AM_V_GEN)$(srcdir)/build-aux/$@ $(srcdir)/configure.ac
+
+gen_start_date = 2012-01-16
+.PHONY: gen-ChangeLog
+gen-ChangeLog:
+       $(AM_V_GEN)if test -d $(srcdir)/.git; then      \
+         cl=$(distdir)/ChangeLog &&                    \
+         rm -f $$cl.tmp &&                             \
+         $(top_srcdir)/build-aux/gitlog-to-changelog   \
+           --strip-tab                                 \
+           --strip-cherry-pick                         \
+           --no-cluster                                \
+           --amend=$(srcdir)/build-aux/git-log-fix     \
+           --srcdir=$(srcdir)                          \
+           --since=$(gen_start_date) > $$cl.tmp &&     \
+         mv -f $$cl.tmp $$cl;                          \
+       fi