tests: minor fixes/simplifications

[bison.git] / cfg.mk

diff --git a/cfg.mk b/cfg.mk
index 913ecb8a784a2fcd1c3acf3c1ed7fd722202e3a2..ce7553932cc977519263e4f293ec96e1118eeacc 100644 (file)
--- a/cfg.mk
+++ b/cfg.mk
@@ -1,5 +1,6 @@
 # Customize maint.mk                           -*- makefile -*-
 # Customize maint.mk                           -*- makefile -*-

-# Copyright (C) 2008 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
 
 # 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


@@ -14,11 +15,11 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 

-# It's useful to run maintainer-check* targets during development, but we don't
-# want to wait on a recompile because of an update to $(VERSION).  Thus,
-# override the _is-dist-target from GNUmakefile so that maintainer-check*
+# It's useful to run maintainer-*check* targets during development, but we
+# don't want to wait on a recompile because of an update to $(VERSION).  Thus,
+# override the _is-dist-target from GNUmakefile so that maintainer-*check*

 # targets are filtered out.
 # targets are filtered out.

-_is-dist-target = $(filter-out %clean maintainer-check%, \
+_is-dist-target = $(filter-out %clean maintainer-check% maintainer-%-check, \

   $(filter maintainer-% dist% alpha beta major,$(MAKECMDGOALS)))
 
 # Use alpha.gnu.org for alpha and beta releases.
   $(filter maintainer-% dist% alpha beta major,$(MAKECMDGOALS)))
 
 # Use alpha.gnu.org for alpha and beta releases.


@@ -32,11 +33,34 @@ url_dir_list = \
   ftp://$(gnu_rel_host)/gnu/bison
 
 # Tests not to run as part of "make distcheck".
   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.
 
 # 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
+gnulib_dir = $(srcdir)/gnulib
+
+bootstrap-tools = autoconf,automake,flex,gettext,gnulib
+
+announcement_Cc_ = \
+  bug-bison@gnu.org, help-bison@gnu.org, bison-patches@gnu.org, \
+  coordinator@translationproject.org
+
+update-copyright: update-b4-copyright update-package-copyright-year
+update-copyright-env = \
+  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/                                         \
+)