[Emacs-diffs] trunk r117815: Less chatter in 'make' output.

[Paul Eggert]

------------------------------------------------------------
revno: 117815
revision-id: address@hidden
parent: address@hidden
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Wed 2014-09-03 19:15:56 -0700
message:
  Less chatter in 'make' output.
  
  * doc/Makefile.in (clean):
  * oldXMenu/Makefile.in (clean mostlyclean):
  Simplify, for shorter command line.
  * src/Makefile.in (AM_V_GEN, am__v_GEN_, am__v_GEN_0, am__v_GEN_1, AM_V_at)
  (am__v_at_, am__v_at_0, am__v_at_1):  New macros, taken from Automake.
  ($(etc)/DOC, buildobj.h, gl-stamp): Use them.
modified:
  doc/misc/ChangeLog             changelog-20091113204419-o5vbwnq5f7feedwu-6331
  doc/misc/Makefile.in           
makefile.in-20091113204419-o5vbwnq5f7feedwu-6287
  oldXMenu/ChangeLog             changelog-20091113204419-o5vbwnq5f7feedwu-1572
  oldXMenu/Makefile.in           
makefile.in-20091113204419-o5vbwnq5f7feedwu-1588
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/Makefile.in                makefile.in-20091113204419-o5vbwnq5f7feedwu-631

=== modified file 'doc/misc/ChangeLog'
--- a/doc/misc/ChangeLog        2014-08-28 22:18:39 +0000
+++ b/doc/misc/ChangeLog        2014-09-04 02:15:56 +0000
@@ -1,3 +1,8 @@
+2014-09-04  Paul Eggert  <address@hidden>
+
+       Less chatter in 'make' output.
+       * Makefile.in (clean): Simplify, for shorter command line.
+
 2014-08-07  Reuben Thomas  <address@hidden>
 
        * ediff.texi (Merging and diff3): Don't mention lack of support

=== modified file 'doc/misc/Makefile.in'
--- a/doc/misc/Makefile.in      2014-06-23 06:25:47 +0000
+++ b/doc/misc/Makefile.in      2014-09-04 02:15:56 +0000
@@ -221,8 +221,7 @@
        rm -f gnustmp*
 
 clean: mostlyclean
-       rm -f $(DVI_TARGETS) $(HTML_TARGETS) $(PDF_TARGETS) $(PS_TARGETS)
-       rm -f efaq-w32.dvi efaq-w32.html efaq-w32.pdf efaq-w32.ps
+       rm -f *.dvi *.html *.pdf *.ps
        rm -f emacs-misc-${version}.tar*
 
 distclean: clean

=== modified file 'oldXMenu/ChangeLog'
--- a/oldXMenu/ChangeLog        2014-09-01 09:54:12 +0000
+++ b/oldXMenu/ChangeLog        2014-09-04 02:15:56 +0000
@@ -1,3 +1,8 @@
+2014-09-04  Paul Eggert  <address@hidden>
+
+       Less chatter in 'make' output.
+       * Makefile.in (clean mostlyclean): Simplify, for shorter command line.
+
 2014-09-01  Paul Eggert  <address@hidden>
 
        --enable-silent-rules now suppresses more chatter.

=== modified file 'oldXMenu/Makefile.in'
--- a/oldXMenu/Makefile.in      2014-09-01 09:49:51 +0000
+++ b/oldXMenu/Makefile.in      2014-09-04 02:15:56 +0000
@@ -128,7 +128,7 @@
 .PHONY: mostlyclean clean distclean bootstrap-clean maintainer-clean
 
 clean mostlyclean:
-       rm -f libXMenu11.a ${OBJS} ${EXTRA}
+       rm -f libXMenu11.a *.o
        -rm -rf ${DEPDIR}
 
 bootstrap-clean maintainer-clean distclean: clean

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-09-03 15:10:29 +0000
+++ b/src/ChangeLog     2014-09-04 02:15:56 +0000
@@ -1,3 +1,10 @@
+2014-09-04  Paul Eggert  <address@hidden>
+
+       Less chatter in 'make' output.
+       * Makefile.in (AM_V_GEN, am__v_GEN_, am__v_GEN_0, am__v_GEN_1, AM_V_at)
+       (am__v_at_, am__v_at_0, am__v_at_1):  New macros, taken from Automake.
+       ($(etc)/DOC, buildobj.h, gl-stamp): Use them.
+
 2014-09-03  Martin Rudalics  <address@hidden>
 
        * buffer.c (scroll-bar-height): Fix typo in doc-string.

=== modified file 'src/Makefile.in'
--- a/src/Makefile.in   2014-09-01 09:49:51 +0000
+++ b/src/Makefile.in   2014-09-04 02:15:56 +0000
@@ -317,6 +317,16 @@
 am__v_CCLD_0 = @echo "  CCLD    " $@;
 am__v_CCLD_1 =
 
+AM_V_GEN = $(address@hidden@)
+am__v_GEN_ = $(address@hidden@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 =
+
+AM_V_at = $(address@hidden@)
+am__v_at_ = $(address@hidden@)
+am__v_at_0 = @
+am__v_at_1 =
+
 DEPDIR=deps
 ## -MMD -MF $(DEPDIR)/$*.d if AUTO_DEPEND; else empty.
 address@hidden@
@@ -469,29 +479,32 @@
 ## in the contents of the DOC file.
 ##
 $(etc)/DOC: $(libsrc)/make-docfile$(EXEEXT) $(obj) $(lisp)
-       $(MKDIR_P) $(etc)
-       -rm -f $(etc)/DOC
-       $(libsrc)/make-docfile -d $(srcdir) $(SOME_MACHINE_OBJECTS) $(obj) > 
$(etc)/DOC
-       $(libsrc)/make-docfile -a $(etc)/DOC -d $(lispsource) `sed -n -e 's| 
\\\\||' -e 's|^[   ]*$$(lispsource)/||p' $(srcdir)/lisp.mk`
+       $(AM_V_GEN)$(MKDIR_P) $(etc)
+       -$(AM_V_at)rm -f $(etc)/DOC
+       $(AM_V_at)$(libsrc)/make-docfile -d $(srcdir) \
+         $(SOME_MACHINE_OBJECTS) $(obj) > $(etc)/DOC
+       $(AM_V_at)$(libsrc)/make-docfile -a $(etc)/DOC -d $(lispsource) \
+         `sed -n -e 's| \\\\||' -e 's|^[       ]*$$(lispsource)/||p' \
+            $(srcdir)/lisp.mk`
 
 $(libsrc)/make-docfile$(EXEEXT):
        $(MAKE) -C $(libsrc) make-docfile$(EXEEXT)
 
 buildobj.h: Makefile
-       for i in $(ALLOBJS); do \
+       $(AM_V_GEN)for i in $(ALLOBJS); do \
          echo "$$i" | sed 's,.*/,,; s/\.obj$$/\.o/; s/^/"/; s/$$/",/' \
            || exit; \
        done >address@hidden
-       mv address@hidden $@
+       $(AM_V_at)mv address@hidden $@
 
 globals.h: gl-stamp; @true
 
 GLOBAL_SOURCES = $(base_obj:.o=.c) $(NS_OBJC_OBJ:.o=.m)
 
 gl-stamp: $(libsrc)/make-docfile$(EXEEXT) $(GLOBAL_SOURCES)
-       $(libsrc)/make-docfile -d $(srcdir) -g $(obj) > gl.tmp
-       $(top_srcdir)/build-aux/move-if-change gl.tmp globals.h
-       echo timestamp > $@
+       $(AM_V_GEN)$(libsrc)/make-docfile -d $(srcdir) -g $(obj) > gl.tmp
+       $(AM_V_at)$(top_srcdir)/build-aux/move-if-change gl.tmp globals.h
+       $(AM_V_at)echo timestamp > $@
 
 $(ALLOBJS): globals.h