Merge remote-tracking branch 'fsf/maint'

[bison.git] / cfg.mk

diff --git a/cfg.mk b/cfg.mk
index 503dda6af42c7d49e08068434a8d0cb2d25fc221..ce7553932cc977519263e4f293ec96e1118eeacc 100644 (file)
--- a/cfg.mk
+++ b/cfg.mk
@@ -35,11 +35,7 @@ url_dir_list = \
 # Tests not to run as part of "make distcheck".
 local-checks-to-skip =                 \
   sc_immutable_NEWS                    \
-  sc_prohibit_always-defined_macros    \
-  sc_prohibit_always_true_header_tests \
-  sc_prohibit_atoi_atof                        \
-  sc_prohibit_doubled_word             \
-  sc_prohibit_strcmp
+  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.
@@ -56,11 +52,15 @@ 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_empty_lines_at_EOF=^src/parse-gram.h$$              \
-  require_config_h_first=^(lib/yyerror|data/(glr|yacc))\.c$$   \
-  space_tab=^tests/(input|c\+\+)\.at$$                         \
-  unmarked_diagnostics=^djgpp/                                 \
+$(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/                                         \
 )