diff options
| author | Paul Eggert | 2014-09-03 19:15:56 -0700 |
|---|---|---|
| committer | Paul Eggert | 2014-09-03 19:15:56 -0700 |
| commit | d1db070572aabbc55a419c8ce0b048901c6bafd3 (patch) | |
| tree | 4ed93a9906a4080d1449464ce418b1d1b2915de5 /src | |
| parent | 315d21d20f219234253e11877a382a61fb936cb9 (diff) | |
| download | emacs-d1db070572aabbc55a419c8ce0b048901c6bafd3.tar.gz emacs-d1db070572aabbc55a419c8ce0b048901c6bafd3.zip | |
Less chatter in 'make' output.
* doc/Makefile.in (clean):
* oldXMenu/Makefile.in (clean mostlyclean):
Simplify, for shorter command line.
* src/Makefile.in (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, taken from Automake.
($(etc)/DOC, buildobj.h, gl-stamp): Use them.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 7 | ||||
| -rw-r--r-- | src/Makefile.in | 31 |
2 files changed, 29 insertions, 9 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 4f189e5be38..f463cc71fd8 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,10 @@ | |||
| 1 | 2014-09-04 Paul Eggert <eggert@cs.ucla.edu> | ||
| 2 | |||
| 3 | Less chatter in 'make' output. | ||
| 4 | * Makefile.in (AM_V_GEN, am__v_GEN_, am__v_GEN_0, am__v_GEN_1, AM_V_at) | ||
| 5 | (am__v_at_, am__v_at_0, am__v_at_1): New macros, taken from Automake. | ||
| 6 | ($(etc)/DOC, buildobj.h, gl-stamp): Use them. | ||
| 7 | |||
| 1 | 2014-09-03 Martin Rudalics <rudalics@gmx.at> | 8 | 2014-09-03 Martin Rudalics <rudalics@gmx.at> |
| 2 | 9 | ||
| 3 | * buffer.c (scroll-bar-height): Fix typo in doc-string. | 10 | * buffer.c (scroll-bar-height): Fix typo in doc-string. |
diff --git a/src/Makefile.in b/src/Makefile.in index 3fe1b1c83c2..60c783e00d6 100644 --- a/src/Makefile.in +++ b/src/Makefile.in | |||
| @@ -317,6 +317,16 @@ am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) | |||
| 317 | am__v_CCLD_0 = @echo " CCLD " $@; | 317 | am__v_CCLD_0 = @echo " CCLD " $@; |
| 318 | am__v_CCLD_1 = | 318 | am__v_CCLD_1 = |
| 319 | 319 | ||
| 320 | AM_V_GEN = $(am__v_GEN_@AM_V@) | ||
| 321 | am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) | ||
| 322 | am__v_GEN_0 = @echo " GEN " $@; | ||
| 323 | am__v_GEN_1 = | ||
| 324 | |||
| 325 | AM_V_at = $(am__v_at_@AM_V@) | ||
| 326 | am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) | ||
| 327 | am__v_at_0 = @ | ||
| 328 | am__v_at_1 = | ||
| 329 | |||
| 320 | DEPDIR=deps | 330 | DEPDIR=deps |
| 321 | ## -MMD -MF $(DEPDIR)/$*.d if AUTO_DEPEND; else empty. | 331 | ## -MMD -MF $(DEPDIR)/$*.d if AUTO_DEPEND; else empty. |
| 322 | DEPFLAGS=@DEPFLAGS@ | 332 | DEPFLAGS=@DEPFLAGS@ |
| @@ -469,29 +479,32 @@ emacs$(EXEEXT): temacs$(EXEEXT) \ | |||
| 469 | ## in the contents of the DOC file. | 479 | ## in the contents of the DOC file. |
| 470 | ## | 480 | ## |
| 471 | $(etc)/DOC: $(libsrc)/make-docfile$(EXEEXT) $(obj) $(lisp) | 481 | $(etc)/DOC: $(libsrc)/make-docfile$(EXEEXT) $(obj) $(lisp) |
| 472 | $(MKDIR_P) $(etc) | 482 | $(AM_V_GEN)$(MKDIR_P) $(etc) |
| 473 | -rm -f $(etc)/DOC | 483 | -$(AM_V_at)rm -f $(etc)/DOC |
| 474 | $(libsrc)/make-docfile -d $(srcdir) $(SOME_MACHINE_OBJECTS) $(obj) > $(etc)/DOC | 484 | $(AM_V_at)$(libsrc)/make-docfile -d $(srcdir) \ |
| 475 | $(libsrc)/make-docfile -a $(etc)/DOC -d $(lispsource) `sed -n -e 's| \\\\||' -e 's|^[ ]*$$(lispsource)/||p' $(srcdir)/lisp.mk` | 485 | $(SOME_MACHINE_OBJECTS) $(obj) > $(etc)/DOC |
| 486 | $(AM_V_at)$(libsrc)/make-docfile -a $(etc)/DOC -d $(lispsource) \ | ||
| 487 | `sed -n -e 's| \\\\||' -e 's|^[ ]*$$(lispsource)/||p' \ | ||
| 488 | $(srcdir)/lisp.mk` | ||
| 476 | 489 | ||
| 477 | $(libsrc)/make-docfile$(EXEEXT): | 490 | $(libsrc)/make-docfile$(EXEEXT): |
| 478 | $(MAKE) -C $(libsrc) make-docfile$(EXEEXT) | 491 | $(MAKE) -C $(libsrc) make-docfile$(EXEEXT) |
| 479 | 492 | ||
| 480 | buildobj.h: Makefile | 493 | buildobj.h: Makefile |
| 481 | for i in $(ALLOBJS); do \ | 494 | $(AM_V_GEN)for i in $(ALLOBJS); do \ |
| 482 | echo "$$i" | sed 's,.*/,,; s/\.obj$$/\.o/; s/^/"/; s/$$/",/' \ | 495 | echo "$$i" | sed 's,.*/,,; s/\.obj$$/\.o/; s/^/"/; s/$$/",/' \ |
| 483 | || exit; \ | 496 | || exit; \ |
| 484 | done >$@.tmp | 497 | done >$@.tmp |
| 485 | mv $@.tmp $@ | 498 | $(AM_V_at)mv $@.tmp $@ |
| 486 | 499 | ||
| 487 | globals.h: gl-stamp; @true | 500 | globals.h: gl-stamp; @true |
| 488 | 501 | ||
| 489 | GLOBAL_SOURCES = $(base_obj:.o=.c) $(NS_OBJC_OBJ:.o=.m) | 502 | GLOBAL_SOURCES = $(base_obj:.o=.c) $(NS_OBJC_OBJ:.o=.m) |
| 490 | 503 | ||
| 491 | gl-stamp: $(libsrc)/make-docfile$(EXEEXT) $(GLOBAL_SOURCES) | 504 | gl-stamp: $(libsrc)/make-docfile$(EXEEXT) $(GLOBAL_SOURCES) |
| 492 | $(libsrc)/make-docfile -d $(srcdir) -g $(obj) > gl.tmp | 505 | $(AM_V_GEN)$(libsrc)/make-docfile -d $(srcdir) -g $(obj) > gl.tmp |
| 493 | $(top_srcdir)/build-aux/move-if-change gl.tmp globals.h | 506 | $(AM_V_at)$(top_srcdir)/build-aux/move-if-change gl.tmp globals.h |
| 494 | echo timestamp > $@ | 507 | $(AM_V_at)echo timestamp > $@ |
| 495 | 508 | ||
| 496 | $(ALLOBJS): globals.h | 509 | $(ALLOBJS): globals.h |
| 497 | 510 | ||