[Emacs-diffs] master 5d244fe: Support Make verbosity levels in w32 targets previously left out

[Eli Zaretskii]

branch: master
commit 5d244fec3e0278110b686d66410191b89a463b93
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>

    Support Make verbosity levels in w32 targets previously left out
    
     nt/Makefile.in (AM_V_CC, am__v_CC_, am__v_CC_0, am__v_CC_1)
     (AM_V_CCLD, am__v_CCLD_, am__v_CCLD_0, am__v_CCLD_1, AM_V_RC)
     (am__v_RC_, am__v_RC_0, am__v_RC_1): New macros.
     (addpm${EXEEXT}, ddeclient${EXEEXT}, cmdproxy${EXEEXT})
     (runemacs${EXEEXT}): Use $(AM_V_CCLD).
     (emacs.res, ../src/emacs.res): Use $(AM_V_RC).
    
     lib-src/Makefile.in (AM_V_RC, am__v_RC_, am__v_RC_0, am__v_RC_1): New
     macros.
     (emacsclient.res): Use $(AM_V_RC).
---
 lib-src/ChangeLog   |    6 ++++++
 lib-src/Makefile.in |    7 ++++++-
 nt/ChangeLog        |    9 +++++++++
 nt/Makefile.in      |   28 +++++++++++++++++++++++-----
 4 files changed, 44 insertions(+), 6 deletions(-)

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 7cbf327..37f037e 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,9 @@
+2015-01-16  Eli Zaretskii  <address@hidden>
+
+       * Makefile.in (AM_V_RC, am__v_RC_, am__v_RC_0, am__v_RC_1): New
+       macros.
+       (emacsclient.res): Use $(AM_V_RC).
+
 2015-01-16  Paul Eggert  <address@hidden>
 
        Give up on -Wsuggest-attribute=const
diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index 22a5eca..01592bd 100644
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -58,6 +58,11 @@ am__v_CCLD_ = $(address@hidden@)
 am__v_CCLD_0 = @echo "  CCLD    " $@;
 am__v_CCLD_1 =
 
+AM_V_RC = $(address@hidden@)
+am__v_RC_ = $(address@hidden@)
+am__v_RC_0 = @echo "  RC      " $@;
+am__v_RC_1 =
+
 # ==================== Where To Install Things ====================
 
 # Location to install Emacs.app under GNUstep / Mac OS X.
@@ -381,6 +386,6 @@ update-game-score${EXEEXT}: ${srcdir}/update-game-score.c 
$(NTLIB) $(config_h)
          $< $(NTLIB) $(LOADLIBES) -o $@
 
 emacsclient.res: ../nt/emacsclient.rc $(NTINC)/../icons/emacs.ico
-       $(WINDRES) -O coff --include-dir=$(NTINC)/.. -o $@ $<
+       $(AM_V_RC)$(WINDRES) -O coff --include-dir=$(NTINC)/.. -o $@ $<
 
 ## Makefile ends here.
diff --git a/nt/ChangeLog b/nt/ChangeLog
index 5f61042..b9966fb 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,12 @@
+2015-01-16  Eli Zaretskii  <address@hidden>
+
+       * Makefile.in (AM_V_CC, am__v_CC_, am__v_CC_0, am__v_CC_1)
+       (AM_V_CCLD, am__v_CCLD_, am__v_CCLD_0, am__v_CCLD_1, AM_V_RC)
+       (am__v_RC_, am__v_RC_0, am__v_RC_1): New macros.
+       (addpm${EXEEXT}, ddeclient${EXEEXT}, cmdproxy${EXEEXT})
+       (runemacs${EXEEXT}): Use $(AM_V_CCLD).
+       (emacs.res, ../src/emacs.res): Use $(AM_V_RC).
+
 2014-12-26  Eli Zaretskii  <address@hidden>
 
        * gnulib.mk (stpcpy, string): Sync with the latest change in
diff --git a/nt/Makefile.in b/nt/Makefile.in
index 01631d8..fc6887f 100644
--- a/nt/Makefile.in
+++ b/nt/Makefile.in
@@ -41,6 +41,24 @@ WERROR_CFLAGS = @WERROR_CFLAGS@
 # Program name transformation.
 TRANSFORM = @program_transform_name@
 
+# 'make' verbosity.
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+
+AM_V_CC = $(address@hidden@)
+am__v_CC_ = $(address@hidden@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 =
+
+AM_V_CCLD = $(address@hidden@)
+am__v_CCLD_ = $(address@hidden@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 =
+
+AM_V_RC = $(address@hidden@)
+am__v_RC_ = $(address@hidden@)
+am__v_RC_0 = @echo "  RC      " $@;
+am__v_RC_1 =
+
 # ==================== Where To Install Things ====================
 
 # The default location for installation.  Everything is placed in
@@ -213,18 +231,18 @@ TAGS: ${EXE_FILES:${EXEEXT}=.c}
 
 ## Build the programs
 addpm${EXEEXT}: ${srcdir}/addpm.c ../src/epaths.h
-       $(CC) ${ALL_CFLAGS} $< $(LIBS_ADDPM) -o $@
+       $(AM_V_CCLD)$(CC) ${ALL_CFLAGS} $< $(LIBS_ADDPM) -o $@
 
 ddeclient${EXEEXT}: ${srcdir}/ddeclient.c
-       $(CC) ${ALL_CFLAGS} $< -o $@
+       $(AM_V_CCLD)$(CC) ${ALL_CFLAGS} $< -o $@
 
 cmdproxy${EXEEXT}: ${srcdir}/cmdproxy.c
-       $(CC) ${ALL_CFLAGS} $< -o $@
+       $(AM_V_CCLD)$(CC) ${ALL_CFLAGS} $< -o $@
 
 runemacs${EXEEXT}: ${srcdir}/runemacs.c $(EMACSRES)
-       $(CC) ${ALL_CFLAGS} $^ -mwindows -o $@
+       $(AM_V_CCLD)$(CC) ${ALL_CFLAGS} $^ -mwindows -o $@
 
 ## Also used in ../src/Makefile.
 emacs.res ../src/emacs.res: emacs.rc ${srcdir}/icons/emacs.ico \
   ${srcdir}/icons/hand.cur ${srcdir}/$(EMACS_MANIFEST)
-       ${WINDRES} -I ${srcdir} -O coff -o $@ $<
+       $(AM_V_RC)${WINDRES} -I ${srcdir} -O coff -o $@ $<