Merge branch master of git.sv.gnu.org:/srv/git/emacs.

9 files changed, 34 insertions, 21 deletions

diff --git a/admin/grammars/Makefile.in b/admin/grammars/Makefile.in
index c3ee2ef951f..6b54ecca237 100644
--- a/admin/grammars/Makefile.in
+++ b/admin/grammars/Makefile.in
@@ -1,6 +1,6 @@
 ### @configure_input@
 
-## Copyright (C) 2013-2014 Free Software Foundation, Inc.
+## Copyright (C) 2013-2015 Free Software Foundation, Inc.
 
 ## This file is part of GNU Emacs.
 
@@ -28,6 +28,19 @@ srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 top_builddir = @top_builddir@
 
+# 'make' verbosity.
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 =
+
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
+
 # Prevent any settings in the user environment causing problems.
 unexport EMACSDATA EMACSDOC EMACSPATH
 
@@ -68,30 +81,30 @@ wisent: ${WISENT}
 
 ## c-by.el, make-by.el.
 ${bovinedir}/%-by.el: ${srcdir}/%.by
-        [ ! -f "$@" ] || chmod +w "$@"
-        ${make_bovine} -o "$@" $<
+        $(AM_V_GEN)[ ! -f "$@" ] || chmod +w "$@"
+        $(AM_V_at)${make_bovine} -o "$@" $<
 
 ${bovinedir}/scm-by.el: ${srcdir}/scheme.by
-        [ ! -f "$@" ] || chmod +w "$@"
-        ${make_bovine} -o "$@" $<
+        $(AM_V_GEN)[ ! -f "$@" ] || chmod +w "$@"
+        $(AM_V_at)${make_bovine} -o "$@" $<
 
 ## grammar-wy.el
 ${cedetdir}/semantic/%-wy.el: ${srcdir}/%.wy
-        [ ! -f "$@" ] || chmod +w "$@"
-        ${make_wisent} -o "$@" $<
+        $(AM_V_GEN)[ ! -f "$@" ] || chmod +w "$@"
+        $(AM_V_at)${make_wisent} -o "$@" $<
 
 ## js-wy.el, python-wy.el
 ${wisentdir}/%-wy.el: ${srcdir}/%.wy
-        [ ! -f "$@" ] || chmod +w "$@"
-        ${make_wisent} -o "$@" $<
+        $(AM_V_GEN)[ ! -f "$@" ] || chmod +w "$@"
+        $(AM_V_at)${make_wisent} -o "$@" $<
 
 ${wisentdir}/javat-wy.el: ${srcdir}/java-tags.wy
-        [ ! -f "$@" ] || chmod +w "$@"
-        ${make_wisent} -o "$@" $<
+        $(AM_V_GEN)[ ! -f "$@" ] || chmod +w "$@"
+        $(AM_V_at)${make_wisent} -o "$@" $<
 
 ${cedetdir}/srecode/srt-wy.el: ${srcdir}/srecode-template.wy
-        [ ! -f "$@" ] || chmod +w "$@"
-        ${make_wisent} -o "$@" $<
+        $(AM_V_GEN)[ ! -f "$@" ] || chmod +w "$@"
+        $(AM_V_at)${make_wisent} -o "$@" $<
 
 
 .PHONY: distclean bootstrap-clean maintainer-clean extraclean
diff --git a/admin/grammars/c.by b/admin/grammars/c.by
index f6015490939..8a3a194b00e 100644
--- a/admin/grammars/c.by
+++ b/admin/grammars/c.by
@@ -1,5 +1,5 @@
 ;;; c.by -- LL grammar for C/C++ language specification
-;; Copyright (C) 1999-2014 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2015 Free Software Foundation, Inc.
 ;;
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;;         David Ponce <david@dponce.com>
diff --git a/admin/grammars/grammar.wy b/admin/grammars/grammar.wy
index 4605e3c4f70..fcb36fdc778 100644
--- a/admin/grammars/grammar.wy
+++ b/admin/grammars/grammar.wy
@@ -1,6 +1,6 @@
 ;;; semantic-grammar.wy -- LALR grammar of Semantic input grammars
 ;;
-;; Copyright (C) 2002-2014 Free Software Foundation, Inc.
+;; Copyright (C) 2002-2015 Free Software Foundation, Inc.
 ;;
 ;; Author: David Ponce <david@dponce.com>
 ;; Maintainer: David Ponce <david@dponce.com>
diff --git a/admin/grammars/java-tags.wy b/admin/grammars/java-tags.wy
index 9ff27f3a2be..bc22f4f8311 100644
--- a/admin/grammars/java-tags.wy
+++ b/admin/grammars/java-tags.wy
@@ -1,6 +1,6 @@
 ;;; java-tags.wy -- Semantic LALR grammar for Java
 
-;; Copyright (C) 2002-2014 Free Software Foundation, Inc.
+;; Copyright (C) 2002-2015 Free Software Foundation, Inc.
 ;;
 ;; Author: David Ponce <david@dponce.com>
 ;; Maintainer: David Ponce <david@dponce.com>
diff --git a/admin/grammars/js.wy b/admin/grammars/js.wy
index 91dbff2330d..1579b0787d7 100644
--- a/admin/grammars/js.wy
+++ b/admin/grammars/js.wy
@@ -1,6 +1,6 @@
 ;;; javascript-jv.wy -- LALR grammar for Javascript
 
-;; Copyright (C) 2005-2014 Free Software Foundation, Inc.
+;; Copyright (C) 2005-2015 Free Software Foundation, Inc.
 ;; Copyright (C) 1998-2011 Ecma International.
 
 ;; Author: Joakim Verona
diff --git a/admin/grammars/make.by b/admin/grammars/make.by
index 7fc39518faf..be3cc433863 100644
--- a/admin/grammars/make.by
+++ b/admin/grammars/make.by
@@ -1,6 +1,6 @@
 ;;; make.by -- BY notation for Makefiles.
 
-;; Copyright (C) 1999-2014 Free Software Foundation, Inc.
+;; Copyright (C) 1999-2015 Free Software Foundation, Inc.
 ;;
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;;         David Ponce <david@dponce.com>
diff --git a/admin/grammars/python.wy b/admin/grammars/python.wy
index 330264de459..9b37a8deaec 100644
--- a/admin/grammars/python.wy
+++ b/admin/grammars/python.wy
@@ -1,6 +1,6 @@
 ;;; python.wy -- LALR grammar for Python
 
-;; Copyright (C) 2002-2014 Free Software Foundation, Inc.
+;; Copyright (C) 2002-2015 Free Software Foundation, Inc.
 ;; Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
 ;; 2009, 2010 Python Software Foundation; All Rights Reserved
 
diff --git a/admin/grammars/scheme.by b/admin/grammars/scheme.by
index 16b67a3db4b..1b67d624320 100644
--- a/admin/grammars/scheme.by
+++ b/admin/grammars/scheme.by
@@ -1,6 +1,6 @@
 ;;; scheme.by -- Scheme BNF language specification
 
-;; Copyright (C) 2001-2014 Free Software Foundation, Inc.
+;; Copyright (C) 2001-2015 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
diff --git a/admin/grammars/srecode-template.wy b/admin/grammars/srecode-template.wy
index d4dd2ad907a..32ef7eac8ad 100644
--- a/admin/grammars/srecode-template.wy
+++ b/admin/grammars/srecode-template.wy
@@ -1,6 +1,6 @@
 ;;; srecode-template.wy --- Semantic Recoder Template parser
 
-;; Copyright (C) 2005-2014 Free Software Foundation, Inc.
+;; Copyright (C) 2005-2015 Free Software Foundation, Inc.
 
 ;; Author: Eric Ludlam <zappo@gnu.org>
 ;; Keywords: syntax