Merge remote-tracking branch 'fsf/maint'

[bison.git] / cfg.mk

diff --git a/cfg.mk b/cfg.mk
index a43ca2fe37f9ca1083b1ccc9bbafedc6d14baaa8..ce7553932cc977519263e4f293ec96e1118eeacc 100644 (file)
--- a/cfg.mk
+++ b/cfg.mk
@@ -1,6 +1,6 @@
 # Customize maint.mk                           -*- makefile -*-
 
-# Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
+# Copyright (C) 2008-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
@@ -33,16 +33,15 @@ url_dir_list = \
   ftp://$(gnu_rel_host)/gnu/bison
 
 # Tests not to run as part of "make distcheck".
-# Exclude changelog-check here so that there's less churn in ChangeLog
-# files -- otherwise, you'd need to have the upcoming version number
-# at the top of the file for each `make distcheck' run.
-local-checks-to-skip = changelog-check
+local-checks-to-skip =                 \
+  sc_immutable_NEWS                    \
+  sc_prohibit_atoi_atof
 
 # The local directory containing the checked-out copy of gnulib used in
 # this release.  Used solely to get a date for the "announcement" target.
 gnulib_dir = $(srcdir)/gnulib
 
-bootstrap-tools = autoconf,automake,flex,gnulib
+bootstrap-tools = autoconf,automake,flex,gettext,gnulib
 
 announcement_Cc_ = \
   bug-bison@gnu.org, help-bison@gnu.org, bison-patches@gnu.org, \
@@ -50,4 +49,18 @@ announcement_Cc_ = \
 
 update-copyright: update-b4-copyright update-package-copyright-year
 update-copyright-env = \
-  UPDATE_COPYRIGHT_FORCE=1
+  UPDATE_COPYRIGHT_FORCE=1 UPDATE_COPYRIGHT_USE_INTERVALS=1
+
+exclude = $(foreach a,$(1),$(eval exclude_file_name_regexp--sc_$(a)))
+$(call exclude,                                                                \
+  bindtextdomain=^lib/main.c$$                                         \
+  program_name=^lib/main.c$$                                           \
+  prohibit_always-defined_macros=^data/yacc.c|^djgpp/                  \
+  prohibit_always-defined_macros+=?|^src/(parse-gram.c|system.h)$$     \
+  prohibit_always-defined_macros+=?|^tests/regression.at$$             \
+  prohibit_empty_lines_at_EOF=^src/parse-gram.h$$                      \
+  prohibit_strcmp=^doc/bison\.texinfo$$                                        \
+  require_config_h_first=^(lib/yyerror|data/(glr|yacc))\.c$$           \
+  space_tab=^tests/(input|c\+\+)\.at$$                                 \
+  unmarked_diagnostics=^djgpp/                                         \
+)