Merge remote-tracking branch 'origin/maint'

[bison.git] / cfg.mk

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

-

 # Copyright (C) 2008-2012 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # 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/>.
 
 # 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*


@@ -22,13 +32,6 @@
 _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
 
 url_dir_list = \
   ftp://$(gnu_rel_host)/gnu/bison
 


@@ -56,6 +59,7 @@ $(call exclude,                                                               \
   bindtextdomain=^lib/main.c$$                                         \
   program_name=^lib/main.c$$                                           \
   prohibit_always-defined_macros=^data/yacc.c|^djgpp/                  \
   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_empty_lines_at_EOF=^src/parse-gram.h$$                      \
   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$$                      \