X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/62a87154b3bb1af77ee153603972090a600bafce..70a04dce64d179ac6647a4a60cd029a34e7241e5:/cfg.mk

diff --git a/cfg.mk b/cfg.mk
index 515ac253..e50c6293 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -1,5 +1,4 @@
 # Customize maint.mk                           -*- makefile -*-
-
 # Copyright (C) 2008-2012 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
@@ -15,6 +14,17 @@
 # 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
+
 # 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*
@@ -22,34 +32,13 @@
 _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.
-# Use ftp.gnu.org for major releases.
-gnu_ftp_host-alpha = alpha.gnu.org
-gnu_ftp_host-beta = alpha.gnu.org
-gnu_ftp_host-major = ftp.gnu.org
-gnu_rel_host = $(gnu_ftp_host-$(RELEASE_TYPE))
-
 url_dir_list = \
   ftp://$(gnu_rel_host)/gnu/bison
 
 # Tests not to run as part of "make distcheck".
 local-checks-to-skip =			\
   sc_immutable_NEWS			\
-  sc_bindtextdomain			\
-  sc_error_message_period		\
-  sc_error_message_uppercase		\
-  sc_program_name			\
-  sc_prohibit_HAVE_MBRTOWC		\
-  sc_prohibit_always-defined_macros	\
-  sc_prohibit_always_true_header_tests	\
-  sc_prohibit_atoi_atof			\
-  sc_prohibit_doubled_word		\
-  sc_prohibit_empty_lines_at_EOF	\
-  sc_prohibit_magic_number_exit		\
-  sc_prohibit_quotearg_without_use	\
-  sc_prohibit_strcmp			\
-  sc_unmarked_diagnostics		\
-  sc_useless_cpp_parens
+  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.
@@ -65,6 +54,20 @@ update-copyright: update-b4-copyright update-package-copyright-year
 update-copyright-env = \
   UPDATE_COPYRIGHT_FORCE=1 UPDATE_COPYRIGHT_USE_INTERVALS=1
 
-exclude_file_name_regexp--sc_space_tab = ^tests/(input|c\+\+)\.at$$
-exclude_file_name_regexp--sc_require_config_h_first = \
-  ^(lib/yyerror|data/(glr|yacc))\.c$$
+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+=?|^lib/timevar.c$$			\
+  prohibit_always-defined_macros+=?|^src/(parse-gram.c|system.h)$$	\
+  prohibit_always-defined_macros+=?|^tests/regression.at$$		\
+  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$$					\
+  unmarked_diagnostics=^(djgpp/|doc/bison.texi$$)			\
+)