aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2015-01-16 11:33:08 +0200
committerEli Zaretskii2015-01-16 11:33:08 +0200
commit5d244fec3e0278110b686d66410191b89a463b93 (patch)
treedb2e7e87a1f810b41f4efa0f4c695c9558d2eaca
parent3b48f99542d822c0647334524035e93f4a094358 (diff)
downloademacs-5d244fec3e0278110b686d66410191b89a463b93.tar.gz
emacs-5d244fec3e0278110b686d66410191b89a463b93.zip
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/ChangeLog6
-rw-r--r--lib-src/Makefile.in7
-rw-r--r--nt/ChangeLog9
-rw-r--r--nt/Makefile.in28
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 @@
12015-01-16 Eli Zaretskii <eliz@gnu.org>
2
3 * Makefile.in (AM_V_RC, am__v_RC_, am__v_RC_0, am__v_RC_1): New
4 macros.
5 (emacsclient.res): Use $(AM_V_RC).
6
12015-01-16 Paul Eggert <eggert@cs.ucla.edu> 72015-01-16 Paul Eggert <eggert@cs.ucla.edu>
2 8
3 Give up on -Wsuggest-attribute=const 9 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@)
58am__v_CCLD_0 = @echo " CCLD " $@; 58am__v_CCLD_0 = @echo " CCLD " $@;
59am__v_CCLD_1 = 59am__v_CCLD_1 =
60 60
61AM_V_RC = $(am__v_RC_@AM_V@)
62am__v_RC_ = $(am__v_RC_@AM_DEFAULT_V@)
63am__v_RC_0 = @echo " RC " $@;
64am__v_RC_1 =
65
61# ==================== Where To Install Things ==================== 66# ==================== Where To Install Things ====================
62 67
63# Location to install Emacs.app under GNUstep / Mac OS X. 68# 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)
381 $< $(NTLIB) $(LOADLIBES) -o $@ 386 $< $(NTLIB) $(LOADLIBES) -o $@
382 387
383emacsclient.res: ../nt/emacsclient.rc $(NTINC)/../icons/emacs.ico 388emacsclient.res: ../nt/emacsclient.rc $(NTINC)/../icons/emacs.ico
384 $(WINDRES) -O coff --include-dir=$(NTINC)/.. -o $@ $< 389 $(AM_V_RC)$(WINDRES) -O coff --include-dir=$(NTINC)/.. -o $@ $<
385 390
386## Makefile ends here. 391## 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 @@
12015-01-16 Eli Zaretskii <eliz@gnu.org>
2
3 * Makefile.in (AM_V_CC, am__v_CC_, am__v_CC_0, am__v_CC_1)
4 (AM_V_CCLD, am__v_CCLD_, am__v_CCLD_0, am__v_CCLD_1, AM_V_RC)
5 (am__v_RC_, am__v_RC_0, am__v_RC_1): New macros.
6 (addpm${EXEEXT}, ddeclient${EXEEXT}, cmdproxy${EXEEXT})
7 (runemacs${EXEEXT}): Use $(AM_V_CCLD).
8 (emacs.res, ../src/emacs.res): Use $(AM_V_RC).
9
12014-12-26 Eli Zaretskii <eliz@gnu.org> 102014-12-26 Eli Zaretskii <eliz@gnu.org>
2 11
3 * gnulib.mk (stpcpy, string): Sync with the latest change in 12 * 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@
41# Program name transformation. 41# Program name transformation.
42TRANSFORM = @program_transform_name@ 42TRANSFORM = @program_transform_name@
43 43
44# 'make' verbosity.
45AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
46
47AM_V_CC = $(am__v_CC_@AM_V@)
48am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
49am__v_CC_0 = @echo " CC " $@;
50am__v_CC_1 =
51
52AM_V_CCLD = $(am__v_CCLD_@AM_V@)
53am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
54am__v_CCLD_0 = @echo " CCLD " $@;
55am__v_CCLD_1 =
56
57AM_V_RC = $(am__v_RC_@AM_V@)
58am__v_RC_ = $(am__v_RC_@AM_DEFAULT_V@)
59am__v_RC_0 = @echo " RC " $@;
60am__v_RC_1 =
61
44# ==================== Where To Install Things ==================== 62# ==================== Where To Install Things ====================
45 63
46# The default location for installation. Everything is placed in 64# The default location for installation. Everything is placed in
@@ -213,18 +231,18 @@ TAGS: ${EXE_FILES:${EXEEXT}=.c}
213 231
214## Build the programs 232## Build the programs
215addpm${EXEEXT}: ${srcdir}/addpm.c ../src/epaths.h 233addpm${EXEEXT}: ${srcdir}/addpm.c ../src/epaths.h
216 $(CC) ${ALL_CFLAGS} $< $(LIBS_ADDPM) -o $@ 234 $(AM_V_CCLD)$(CC) ${ALL_CFLAGS} $< $(LIBS_ADDPM) -o $@
217 235
218ddeclient${EXEEXT}: ${srcdir}/ddeclient.c 236ddeclient${EXEEXT}: ${srcdir}/ddeclient.c
219 $(CC) ${ALL_CFLAGS} $< -o $@ 237 $(AM_V_CCLD)$(CC) ${ALL_CFLAGS} $< -o $@
220 238
221cmdproxy${EXEEXT}: ${srcdir}/cmdproxy.c 239cmdproxy${EXEEXT}: ${srcdir}/cmdproxy.c
222 $(CC) ${ALL_CFLAGS} $< -o $@ 240 $(AM_V_CCLD)$(CC) ${ALL_CFLAGS} $< -o $@
223 241
224runemacs${EXEEXT}: ${srcdir}/runemacs.c $(EMACSRES) 242runemacs${EXEEXT}: ${srcdir}/runemacs.c $(EMACSRES)
225 $(CC) ${ALL_CFLAGS} $^ -mwindows -o $@ 243 $(AM_V_CCLD)$(CC) ${ALL_CFLAGS} $^ -mwindows -o $@
226 244
227## Also used in ../src/Makefile. 245## Also used in ../src/Makefile.
228emacs.res ../src/emacs.res: emacs.rc ${srcdir}/icons/emacs.ico \ 246emacs.res ../src/emacs.res: emacs.rc ${srcdir}/icons/emacs.ico \
229 ${srcdir}/icons/hand.cur ${srcdir}/$(EMACS_MANIFEST) 247 ${srcdir}/icons/hand.cur ${srcdir}/$(EMACS_MANIFEST)
230 ${WINDRES} -I ${srcdir} -O coff -o $@ $< 248 $(AM_V_RC)${WINDRES} -I ${srcdir} -O coff -o $@ $<