Update copyright year to 2015

[gnu-emacs] / lisp / Makefile.in

diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index 5733ea52715a1951f152ec8dcbca38a22840646f..67855baf9f3f1be5493a844301c3d1288e9a909b 100644 (file)
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -1,6 +1,6 @@
 ### @configure_input@
 
-# Copyright (C) 2000-2014 Free Software Foundation, Inc.
+# Copyright (C) 2000-2015 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
@@ -28,6 +28,14 @@ VPATH = $(srcdir)
 # limitation.
 XARGS_LIMIT = @XARGS_LIMIT@
 
+# '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 =
+
 # You can specify a different executable on the make command line,
 # e.g. "make EMACS=../src/emacs ...".
 
@@ -156,7 +164,7 @@ all: compile-main $(lisp)/cus-load.el $(lisp)/finder-inf.el
 $(lisp)/cus-load.el:
        $(MAKE) custom-deps
 custom-deps:
-       $(setwins_almost); \
+       $(AM_V_GEN)$(setwins_almost); \
        echo Directories: $$wins; \
        $(emacs) -l cus-dep \
          --eval '(setq generated-custom-dependencies-file (unmsys--file-name "$(srcdir)/cus-load.el"))' \
@@ -165,7 +173,7 @@ custom-deps:
 $(lisp)/finder-inf.el:
        $(MAKE) finder-data
 finder-data:
-       $(setwins_finder); \
+       $(AM_V_GEN)$(setwins_finder); \
        echo Directories: $$wins; \
        $(emacs) -l finder \
          --eval '(setq generated-finder-keywords-file (unmsys--file-name "$(srcdir)/finder-inf.el"))' \
@@ -178,47 +186,36 @@ finder-data:
 # If you want to allow autoloads in such files, remove that,
 # and make this depend on leim.
 autoloads: $(LOADDEFS)
-       $(setwins_almost); \
+       $(AM_V_GEN)$(setwins_almost); \
        echo Directories: $$wins; \
        $(emacs) -l autoload \
            --eval '(setq autoload-ensure-writable t)' \
            --eval '(setq autoload-builtin-package-versions t)' \
            --eval '(setq generated-autoload-file (expand-file-name (unmsys--file-name "$(srcdir)/loaddefs.el")))' \
            -f batch-update-autoloads $$wins
-       $(MAKE) obsolete-autoloads
-
-# The obsolete/ subdirectory is normally not scanned for autoloads.
-# Sometimes we still want to autoload something from that directory,
-# eg iswitchb.
-.PHONY: obsolete-autoloads
-obsolete-autoloads: ${lisp}/obsolete/*.el
-       $(emacs) -l autoload \
-           --eval '(setq generate-autoload-cookie ";;;###obsolete-autoload")' \
-           --eval '(setq generated-autoload-file (expand-file-name (unmsys--file-name "$(srcdir)/loaddefs.el")))' \
-           -f batch-update-autoloads ${lisp}/obsolete
 
 # This is required by the bootstrap-emacs target in ../src/Makefile, so
 # we know that if we have an emacs executable, we also have a subdirs.el.
 $(lisp)/subdirs.el:
        $(MAKE) update-subdirs
 update-subdirs:
-       $(setwins_for_subdirs); \
+       $(AM_V_GEN)$(setwins_for_subdirs); \
        for file in $$wins; do \
           $(srcdir)/../build-aux/update-subdirs $$file; \
        done;
 
-.PHONY: updates bzr-update update-authors
+.PHONY: updates repo-update update-authors
 
 # Some modes of make-dist use this.
 updates: update-subdirs autoloads finder-data custom-deps
 
-# This is useful after "bzr up"; but it doesn't do anything that a
-# plain "make" at top-level doesn't.
-# The only difference between this and this directory's "all" rule
-# is that this runs "autoloads" as well (because it uses "compile"
-# rather than "compile-main").  In a bootstrap, $(lisp) in src/Makefile
-# triggers this directory's autoloads rule.
-bzr-update: compile finder-data custom-deps
+# This is useful after updating from the repository; but it doesn't do
+# anything that a plain "make" at top-level doesn't.  The only
+# difference between this and this directory's "all" rule is that this
+# runs "autoloads" as well (because it uses "compile" rather than
+# "compile-main").  In a bootstrap, $(lisp) in src/Makefile triggers
+# this directory's autoloads rule.
+repo-update: compile finder-data custom-deps
 
 # Update the AUTHORS file.
 
@@ -336,13 +333,8 @@ compile-clean:
 leim:
        $(MAKE) -C ../leim all EMACS="$(EMACS)"
 
-# FIXME.  Yuck.
 semantic:
-       case ${EMACS} in \
-         .*) EMACS="../${EMACS}" ;; \
-          *) EMACS="${EMACS}" ;; \
-       esac; \
-       $(MAKE) -C ../admin/grammars all EMACS="$${EMACS}"
+       $(MAKE) -C ../admin/grammars all EMACS="$(EMACS:.%=../.%)"
 
 # Compile all Lisp files, but don't recompile those that are up to
 # date.  Some .el files don't get compiled because they set the
@@ -483,6 +475,11 @@ maintainer-clean: distclean bootstrap-clean
 check-declare:
        $(emacs) -l check-declare --eval '(check-declare-directory "$(lisp)")'
 
+check-defun-dups:
+       sed -n -e '/^(defun /s/\(.\)(.*/\1/p' \
+               $$(find . -name '*.el' -print | grep -v 'loaddefs\.el') \
+           | sort | uniq -d
+
 # Dependencies
 
 ## None of the following matters for bootstrap, which is the only way