diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2015-01-16 11:33:08 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2015-01-16 11:33:08 +0200 |
| commit | 5d244fec3e0278110b686d66410191b89a463b93 (patch) | |
| tree | db2e7e87a1f810b41f4efa0f4c695c9558d2eaca | |
| parent | 3b48f99542d822c0647334524035e93f4a094358 (diff) | |
| download | emacs-5d244fec3e0278110b686d66410191b89a463b93.tar.gz | |
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).
| -rw-r--r-- | lib-src/ChangeLog | 6 | ||||
| -rw-r--r-- | lib-src/Makefile.in | 7 | ||||
| -rw-r--r-- | nt/ChangeLog | 9 | ||||
| -rw-r--r-- | nt/Makefile.in | 28 |
4 files changed, 44 insertions, 6 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 7cbf3274946..37f037ef324 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,9 @@ +2015-01-16 Eli Zaretskii <eliz@gnu.org> + + * 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 <eggert@cs.ucla.edu> Give up on -Wsuggest-attribute=const diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in index 22a5ecad8d8..01592bd21a5 100644 --- a/lib-src/Makefile.in +++ b/lib-src/Makefile.in @@ -58,6 +58,11 @@ am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; am__v_CCLD_1 = +AM_V_RC = $(am__v_RC_@AM_V@) +am__v_RC_ = $(am__v_RC_@AM_DEFAULT_V@) +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 5f6104296c8..b9966fb27d8 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -1,3 +1,12 @@ +2015-01-16 Eli Zaretskii <eliz@gnu.org> + + * 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 <eliz@gnu.org> * gnulib.mk (stpcpy, string): Sync with the latest change in diff --git a/nt/Makefile.in b/nt/Makefile.in index 01631d8ba3f..fc6887f163e 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 = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = + +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = + +AM_V_RC = $(am__v_RC_@AM_V@) +am__v_RC_ = $(am__v_RC_@AM_DEFAULT_V@) +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 $@ $< |