Merge branch 'maint'

[bison.git] / cfg.mk

diff --git a/cfg.mk b/cfg.mk
index c56e965bfe6b69ad140e429fccfbfa1feb8d5812..e50c6293ee60bc618b92b16eca4bbbe5f20dba0d 100644 (file)
--- a/cfg.mk
+++ b/cfg.mk
@@ -14,6 +14,14 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+# Update version, then recompile so that tests/bison --version be
+# up-to-date, then compile our parser again with our up-to-date bison.
+.PHONY: regen
+regen: _version
+       $(MAKE) $(AM_MAKEFLAGS)
+       touch $(srcdir)/src/parse-gram.y
+       $(MAKE) $(AM_MAKEFLAGS)
+
 # Used in maint.mk's web-manual rule
 manual_title = The Yacc-compatible Parser Generator
 
@@ -28,15 +36,9 @@ 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_always_true_header_tests \
-  sc_prohibit_atoi_atof                        \
-  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.
@@ -52,17 +54,20 @@ 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)))
+exclude = \
+  $(foreach a,$(1),$(eval $(subst $$,$$$$,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=^data/yacc.c$$|^djgpp/                        \
   prohibit_always-defined_macros+=?|^lib/timevar.c$$                   \
   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.[ch]$$                   \
+  prohibit_defined_have_decl_tests=?|^lib/timevar.c$$                  \
+  prohibit_magic_number_exit=^doc/bison.texi$$                         \
+  prohibit_magic_number_exit+=?|^tests/(conflicts|regression).at$$     \
+  prohibit_strcmp=^doc/bison\.texi$$                                   \
   require_config_h_first=^(lib/yyerror|data/(glr|yacc))\.c$$           \
   space_tab=^tests/(input|c\+\+)\.at$$                                 \
-  trailing_blank=^src/parse-gram.[ch]$$                                        \
-  unmarked_diagnostics=^djgpp/                                         \
+  unmarked_diagnostics=^(djgpp/|doc/bison.texi$$)                      \
 )