diff options
| author | Eli Zaretskii | 2015-01-16 11:33:08 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2015-01-16 11:33:08 +0200 |
| commit | 5d244fec3e0278110b686d66410191b89a463b93 (patch) | |
| tree | db2e7e87a1f810b41f4efa0f4c695c9558d2eaca | |
| parent | 3b48f99542d822c0647334524035e93f4a094358 (diff) | |
| download | emacs-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/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 @@ | |||
| 1 | 2015-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 | |||
| 1 | 2015-01-16 Paul Eggert <eggert@cs.ucla.edu> | 7 | 2015-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@) | |||
| 58 | am__v_CCLD_0 = @echo " CCLD " $@; | 58 | am__v_CCLD_0 = @echo " CCLD " $@; |
| 59 | am__v_CCLD_1 = | 59 | am__v_CCLD_1 = |
| 60 | 60 | ||
| 61 | AM_V_RC = $(am__v_RC_@AM_V@) | ||
| 62 | am__v_RC_ = $(am__v_RC_@AM_DEFAULT_V@) | ||
| 63 | am__v_RC_0 = @echo " RC " $@; | ||
| 64 | am__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 | ||
| 383 | emacsclient.res: ../nt/emacsclient.rc $(NTINC)/../icons/emacs.ico | 388 | emacsclient.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 @@ | |||
| 1 | 2015-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 | |||
| 1 | 2014-12-26 Eli Zaretskii <eliz@gnu.org> | 10 | 2014-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. |
| 42 | TRANSFORM = @program_transform_name@ | 42 | TRANSFORM = @program_transform_name@ |
| 43 | 43 | ||
| 44 | # 'make' verbosity. | ||
| 45 | AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ | ||
| 46 | |||
| 47 | AM_V_CC = $(am__v_CC_@AM_V@) | ||
| 48 | am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) | ||
| 49 | am__v_CC_0 = @echo " CC " $@; | ||
| 50 | am__v_CC_1 = | ||
| 51 | |||
| 52 | AM_V_CCLD = $(am__v_CCLD_@AM_V@) | ||
| 53 | am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) | ||
| 54 | am__v_CCLD_0 = @echo " CCLD " $@; | ||
| 55 | am__v_CCLD_1 = | ||
| 56 | |||
| 57 | AM_V_RC = $(am__v_RC_@AM_V@) | ||
| 58 | am__v_RC_ = $(am__v_RC_@AM_DEFAULT_V@) | ||
| 59 | am__v_RC_0 = @echo " RC " $@; | ||
| 60 | am__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 |
| 215 | addpm${EXEEXT}: ${srcdir}/addpm.c ../src/epaths.h | 233 | addpm${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 | ||
| 218 | ddeclient${EXEEXT}: ${srcdir}/ddeclient.c | 236 | ddeclient${EXEEXT}: ${srcdir}/ddeclient.c |
| 219 | $(CC) ${ALL_CFLAGS} $< -o $@ | 237 | $(AM_V_CCLD)$(CC) ${ALL_CFLAGS} $< -o $@ |
| 220 | 238 | ||
| 221 | cmdproxy${EXEEXT}: ${srcdir}/cmdproxy.c | 239 | cmdproxy${EXEEXT}: ${srcdir}/cmdproxy.c |
| 222 | $(CC) ${ALL_CFLAGS} $< -o $@ | 240 | $(AM_V_CCLD)$(CC) ${ALL_CFLAGS} $< -o $@ |
| 223 | 241 | ||
| 224 | runemacs${EXEEXT}: ${srcdir}/runemacs.c $(EMACSRES) | 242 | runemacs${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. |
| 228 | emacs.res ../src/emacs.res: emacs.rc ${srcdir}/icons/emacs.ico \ | 246 | emacs.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 $@ $< |