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 /lib-src | |
| 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).
Diffstat (limited to 'lib-src')
| -rw-r--r-- | lib-src/ChangeLog | 6 | ||||
| -rw-r--r-- | lib-src/Makefile.in | 7 |
2 files changed, 12 insertions, 1 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. |