Merge remote-tracking branch 'origin/maint'

[bison.git] / cfg.mk

diff --git a/cfg.mk b/cfg.mk
index 501e8dce2ca46a658adbffecc8bee199495ffa6f..e50c6293ee60bc618b92b16eca4bbbe5f20dba0d 100644 (file)
--- a/cfg.mk
+++ b/cfg.mk
@@ -1,5 +1,5 @@
 # Customize maint.mk                           -*- makefile -*-
 # Customize maint.mk                           -*- makefile -*-

-# Copyright (C) 2008-2009 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,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/>.
 
 # 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*
 # 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*


@@ -21,28 +32,42 @@
 _is-dist-target = $(filter-out %clean maintainer-check% maintainer-%-check, \
   $(filter maintainer-% dist% alpha beta major,$(MAKECMDGOALS)))
 
 _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".
 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.
 
 # 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,gnulib
+bootstrap-tools = autoconf,automake,flex,gettext,gnulib

 
 

-update-copyright-local = update-b4-copyright
+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
 update-copyright-env = \
   UPDATE_COPYRIGHT_FORCE=1 UPDATE_COPYRIGHT_USE_INTERVALS=1

+
+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$$)                      \
+)