[Emacs-diffs] master ccb2d93 5/7: Less 'make' chatter for lisp dir

[Paul Eggert]

branch: master
commit ccb2d93859f6c7e41c648cf3371e42ee265e3408
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>

    Less 'make' chatter for lisp dir
    
    * lisp/Makefile.in (THEFILE): Define to be 'no-such-file' by default,
    to make it clearer that the caller must specify it.
    (compile-onefile): Remove, replacing by ...
    ($(THEFILE)c): ... new rule.  This lets us use AM_V_GEN here.
    ($(THEFILE)c, .el.elc, $(MH_E_DIR)/mh-loaddefs.el)
    ($(TRAMP_DIR)/tramp-loaddefs.el, $(CAL_DIR)/cal-loaddefs.el)
    ($(CAL_DIR)/diary-loaddefs.el, $(CAL_DIR)/hol-loaddefs.el):
    Use AM_V_GEN to lessen 'make' chatter.
    (.el.elc): Omit duplicate comment.
    * src/Makefile.in (%.elc): Adjust to compile-onefile change in
    ../lisp/Makefile.in.
---
 lisp/ChangeLog   |   11 +++++++++++
 lisp/Makefile.in |   27 ++++++++++-----------------
 src/ChangeLog    |    4 ++++
 src/Makefile.in  |    2 +-
 4 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2feb2af..aa79a8d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,16 @@
 2015-01-04  Paul Eggert  <address@hidden>
 
+       Less 'make' chatter for lisp dir
+       * Makefile.in (THEFILE): Define to be 'no-such-file' by default,
+       to make it clearer that the caller must specify it.
+       (compile-onefile): Remove, replacing by ...
+       ($(THEFILE)c): ... new rule.  This lets us use AM_V_GEN here.
+       ($(THEFILE)c, .el.elc, $(MH_E_DIR)/mh-loaddefs.el)
+       ($(TRAMP_DIR)/tramp-loaddefs.el, $(CAL_DIR)/cal-loaddefs.el)
+       ($(CAL_DIR)/diary-loaddefs.el, $(CAL_DIR)/hol-loaddefs.el):
+       Use AM_V_GEN to lessen 'make' chatter.
+       (.el.elc): Omit duplicate comment.
+
        Less 'make' chatter in batch mode
        * emacs-lisp/autoload.el (autoload-generate-file-autoloads):
        * emacs-lisp/bytecomp.el (byte-compile-file):
diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index 67855ba..565ca77 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -257,12 +257,10 @@ TAGS: $(lisptagsfiles1) $(lisptagsfiles2) 
$(lisptagsfiles3) $(lisptagsfiles4)
 # src/Makefile.in to rebuild a particular Lisp file, no questions asked.
 # Use byte-compile-refresh-preloaded to try and work around some of
 # the most common problems of not bootstrapping from a clean state.
-.PHONY: compile-onefile
-compile-onefile:
-       @echo Compiling $(THEFILE)
-       @# Use byte-compile-refresh-preloaded to try and work around some of
-       @# the most common bootstrapping problems.
-       @$(emacs) $(BYTE_COMPILE_FLAGS) \
+THEFILE = no-such-file
+.PHONY: $(THEFILE)c
+$(THEFILE)c:
+       $(AM_V_GEN)$(emacs) $(BYTE_COMPILE_FLAGS) \
                -l bytecomp -f byte-compile-refresh-preloaded \
                -f batch-byte-compile $(THEFILE)
 
@@ -278,12 +276,7 @@ compile-onefile:
 # An old-fashioned suffix rule, which, according to the GNU Make manual,
 # cannot have prerequisites.
 .el.elc:
-       @echo Compiling $<
-       @# The BIG_STACK_OPTS are only needed to byte-compile the byte-compiler
-       @# files, which is normally done in compile-first, but may also be
-       @# recompiled via this rule.
-       @$(emacs) $(BYTE_COMPILE_FLAGS) \
-               -f batch-byte-compile $<
+       $(AM_V_GEN)$(emacs) $(BYTE_COMPILE_FLAGS) -f batch-byte-compile $<
 
 .PHONY: compile-first compile-main compile compile-always
 
@@ -404,7 +397,7 @@ MH_E_SRC = $(MH_E_DIR)/mh-acros.el $(MH_E_DIR)/mh-alias.el  
  \
 .PHONY: mh-autoloads
 mh-autoloads: $(MH_E_DIR)/mh-loaddefs.el
 $(MH_E_DIR)/mh-loaddefs.el: $(MH_E_SRC)
-       $(emacs) -l autoload \
+       $(AM_V_GEN)$(emacs) -l autoload \
           --eval "(setq generate-autoload-cookie \";;;###mh-autoload\")" \
           --eval "(setq generated-autoload-file (expand-file-name 
(unmsys--file-name \"address@hidden")))" \
           -f batch-update-autoloads $(MH_E_DIR)
@@ -421,7 +414,7 @@ TRAMP_SRC = $(TRAMP_DIR)/tramp.el    
$(TRAMP_DIR)/tramp-adb.el      \
        $(TRAMP_DIR)/tramp-uu.el     $(TRAMP_DIR)/trampver.el
 
 $(TRAMP_DIR)/tramp-loaddefs.el: $(TRAMP_SRC)
-       $(emacs) -l autoload \
+       $(AM_V_GEN)$(emacs) -l autoload \
           --eval "(setq generate-autoload-cookie \";;;###tramp-autoload\")" \
           --eval "(setq generated-autoload-file (expand-file-name 
(unmsys--file-name \"address@hidden")))" \
           -f batch-update-autoloads $(TRAMP_DIR)
@@ -442,19 +435,19 @@ CAL_SRC = $(CAL_DIR)/cal-bahai.el $(CAL_DIR)/cal-china.el 
 \
        $(CAL_DIR)/solar.el
 
 $(CAL_DIR)/cal-loaddefs.el: $(CAL_SRC)
-       $(emacs) -l autoload \
+       $(AM_V_GEN)$(emacs) -l autoload \
           --eval "(setq generate-autoload-cookie \";;;###cal-autoload\")" \
           --eval "(setq generated-autoload-file (expand-file-name 
(unmsys--file-name \"address@hidden")))" \
           -f batch-update-autoloads $(CAL_DIR)
 
 $(CAL_DIR)/diary-loaddefs.el: $(CAL_SRC) $(CAL_DIR)/cal-loaddefs.el
-       $(emacs) -l autoload \
+       $(AM_V_GEN)$(emacs) -l autoload \
           --eval "(setq generate-autoload-cookie \";;;###diary-autoload\")" \
           --eval "(setq generated-autoload-file (expand-file-name 
(unmsys--file-name \"address@hidden")))" \
           -f batch-update-autoloads $(CAL_DIR)
 
 $(CAL_DIR)/hol-loaddefs.el: $(CAL_SRC) $(CAL_DIR)/diary-loaddefs.el
-       $(emacs) -l autoload \
+       $(AM_V_GEN)$(emacs) -l autoload \
           --eval "(setq generate-autoload-cookie \";;;###holiday-autoload\")" \
           --eval "(setq generated-autoload-file (expand-file-name 
(unmsys--file-name \"address@hidden")))" \
           -f batch-update-autoloads $(CAL_DIR)
diff --git a/src/ChangeLog b/src/ChangeLog
index 1629aa0..b503a40 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,9 @@
 2015-01-04  Paul Eggert  <address@hidden>
 
+       Less 'make' chatter for lisp dir
+       * Makefile.in (%.elc): Adjust to compile-onefile change in
+       ../lisp/Makefile.in.
+
        batch write-region no longer says "Wrote FOO"
        This cuts down on 'make' chatter a bit.
        * fileio.c (Fwrite_region):
diff --git a/src/Makefile.in b/src/Makefile.in
index ee45846..a2754ea 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -636,7 +636,7 @@ tags: TAGS ../lisp/TAGS $(lwlibdir)/TAGS
 ## bootstrap-emacs$(EXEEXT) as an order-only prerequisite.
 
 %.elc: %.el | bootstrap-emacs$(EXEEXT)
-       @$(MAKE) -C ../lisp compile-onefile THEFILE=$< EMACS="$(bootstrap_exe)"
+       @$(MAKE) -C ../lisp EMACS="$(bootstrap_exe)" THEFILE=$< $<c
 
 ## VCSWITNESS points to the file that holds info about the current checkout.
 ## We use it as a heuristic to decide when to rebuild loaddefs.el.