lalr1.cc: fix the support of YYERROR with variants

[bison.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index a98611901aab7d267c0e6e54a61e932fcc27b145..339a3c63ae4eb14b0fd645b2a64b0cdc51963101 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in.
 
 ## Process this file with automake to produce Makefile.in.
 

-# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+# 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
 #
 # 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


@@ -32,8 +32,8 @@ EXTRA_DIST = .prev-version .version \
 ## version of Bison nearby...
 BISON = $(top_builddir)/tests/bison
 BISON_IN = $(top_srcdir)/tests/bison.in
 ## 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
+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)
 
 # Initialization before completion by local.mk's.
 AM_CFLAGS = $(WARN_CFLAGS)


@@ -78,12 +78,11 @@ dist-hook: gen-ChangeLog
 
 .PHONY: update-b4-copyright update-package-copyright-year
 update-b4-copyright:
 
 .PHONY: update-b4-copyright update-package-copyright-year
 update-b4-copyright:

-       find data -type f                    \
-         | grep -v -E '^data/bison.m4$$'    \
-         | xargs $(build_aux)/$@
+       $(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:
        @echo 'warning: src/parse-gram.[hc] may need to be regenerated.'
 update-package-copyright-year:

-       $(build_aux)/$@ configure.ac
+       $(AM_V_GEN)$(srcdir)/build-aux/$@ $(srcdir)/configure.ac

 
 gen_start_date = 2012-01-16
 .PHONY: gen-ChangeLog
 
 gen_start_date = 2012-01-16
 .PHONY: gen-ChangeLog