diff options
| author | Paul Eggert | 2014-12-31 07:47:41 -0800 |
|---|---|---|
| committer | Paul Eggert | 2014-12-31 07:48:08 -0800 |
| commit | 5d6b37084b0ef76c495f338b38c00d1b31656b8f (patch) | |
| tree | 65bc769dfc7fc4b78ef4e47b8f3f4ffa0c0dc30f | |
| parent | f588156cbc7b15d6c5c2da3b1cd0e3d56df937b6 (diff) | |
| download | emacs-5d6b37084b0ef76c495f338b38c00d1b31656b8f.tar.gz emacs-5d6b37084b0ef76c495f338b38c00d1b31656b8f.zip | |
Less 'make' chatter at top level
* Makefile.in (AM_DEFAULT_VERBOSITY, AM_V_GEN, am__v_GEN_)
(am__v_GEN_0, am__v_GEN_1, AM_V_at, am__v_at_, am__v_at_0)
(am__v_at_1): New macros, copied from src/Makefile.in.
($(srcdir)/src/config.in, ${srcdir}/info/dir):
Be less chatty when not verbose.
($(srcdir)/src/stamp-h.in): Simplify with '$@'.
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | Makefile.in | 23 |
2 files changed, 28 insertions, 5 deletions
| @@ -1,3 +1,13 @@ | |||
| 1 | 2014-12-31 Paul Eggert <eggert@cs.ucla.edu> | ||
| 2 | |||
| 3 | Less 'make' chatter at top level | ||
| 4 | * Makefile.in (AM_DEFAULT_VERBOSITY, AM_V_GEN, am__v_GEN_) | ||
| 5 | (am__v_GEN_0, am__v_GEN_1, AM_V_at, am__v_at_, am__v_at_0) | ||
| 6 | (am__v_at_1): New macros, copied from src/Makefile.in. | ||
| 7 | ($(srcdir)/src/config.in, ${srcdir}/info/dir): | ||
| 8 | Be less chatty when not verbose. | ||
| 9 | ($(srcdir)/src/stamp-h.in): Simplify with '$@'. | ||
| 10 | |||
| 1 | 2014-12-29 Paul Eggert <eggert@cs.ucla.edu> | 11 | 2014-12-29 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 12 | ||
| 3 | system-name's returned value can vary | 13 | system-name's returned value can vary |
diff --git a/Makefile.in b/Makefile.in index ccb70a436e8..038430b4ff4 100644 --- a/Makefile.in +++ b/Makefile.in | |||
| @@ -94,6 +94,19 @@ configuration=@configuration@ | |||
| 94 | ### The nt/ subdirectory gets built only for MinGW | 94 | ### The nt/ subdirectory gets built only for MinGW |
| 95 | NTDIR=@NTDIR@ | 95 | NTDIR=@NTDIR@ |
| 96 | 96 | ||
| 97 | # 'make' verbosity. | ||
| 98 | AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ | ||
| 99 | |||
| 100 | AM_V_GEN = $(am__v_GEN_@AM_V@) | ||
| 101 | am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) | ||
| 102 | am__v_GEN_0 = @echo " GEN " $@; | ||
| 103 | am__v_GEN_1 = | ||
| 104 | |||
| 105 | AM_V_at = $(am__v_at_@AM_V@) | ||
| 106 | am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) | ||
| 107 | am__v_at_0 = @ | ||
| 108 | am__v_at_1 = | ||
| 109 | |||
| 97 | # ==================== Where To Install Things ==================== | 110 | # ==================== Where To Install Things ==================== |
| 98 | 111 | ||
| 99 | # Location to install Emacs.app under GNUstep / Mac OS X. | 112 | # Location to install Emacs.app under GNUstep / Mac OS X. |
| @@ -441,11 +454,11 @@ $(srcdir)/src/config.in: $(srcdir)/src/stamp-h.in | |||
| 441 | @ # because stamp-h.in has changed (since building stamp-h.in | 454 | @ # because stamp-h.in has changed (since building stamp-h.in |
| 442 | @ # refreshes config.in as well), but if config.in is missing | 455 | @ # refreshes config.in as well), but if config.in is missing |
| 443 | @ # then we really need to do something more. | 456 | @ # then we really need to do something more. |
| 444 | [ -r "$@" ] || ( cd ${srcdir} && ${AUTOHEADER} ) | 457 | $(if $(wildcard $@),,cd $(srcdir) && $(AUTOHEADER)) |
| 445 | $(srcdir)/src/stamp-h.in: $(AUTOCONF_INPUTS) | 458 | $(srcdir)/src/stamp-h.in: $(AUTOCONF_INPUTS) |
| 446 | cd ${srcdir} && ${AUTOHEADER} | 459 | cd ${srcdir} && ${AUTOHEADER} |
| 447 | rm -f $(srcdir)/src/stamp-h.in | 460 | rm -f $@ |
| 448 | echo timestamp > $(srcdir)/src/stamp-h.in | 461 | echo timestamp > $@ |
| 449 | 462 | ||
| 450 | # ==================== Installation ==================== | 463 | # ==================== Installation ==================== |
| 451 | 464 | ||
| @@ -964,8 +977,8 @@ info_dir_deps = \ | |||
| 964 | ## but then we would need to depend on info-real, which would | 977 | ## but then we would need to depend on info-real, which would |
| 965 | ## slow down parallelization. | 978 | ## slow down parallelization. |
| 966 | ${srcdir}/info/dir: ${info_dir_deps} | 979 | ${srcdir}/info/dir: ${info_dir_deps} |
| 967 | ${MKDIR_P} ${srcdir}/info | 980 | $(AM_V_at)${MKDIR_P} ${srcdir}/info |
| 968 | tempfile=info-dir.$$$$; \ | 981 | $(AM_V_GEN)tempfile=info-dir.$$$$; \ |
| 969 | rm -f $${tempfile}; \ | 982 | rm -f $${tempfile}; \ |
| 970 | (cd ${srcdir}/doc && \ | 983 | (cd ${srcdir}/doc && \ |
| 971 | AWK='${AWK}' ../build-aux/make-info-dir ${info_dir_inputs} \ | 984 | AWK='${AWK}' ../build-aux/make-info-dir ${info_dir_inputs} \ |