diff options
| -rw-r--r-- | doc/misc/ChangeLog | 5 | ||||
| -rw-r--r-- | doc/misc/Makefile.in | 3 | ||||
| -rw-r--r-- | oldXMenu/ChangeLog | 5 | ||||
| -rw-r--r-- | oldXMenu/Makefile.in | 2 | ||||
| -rw-r--r-- | src/ChangeLog | 7 | ||||
| -rw-r--r-- | src/Makefile.in | 31 |
6 files changed, 41 insertions, 12 deletions
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index 91074ac3a45..8b7bb7498c9 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,3 +1,8 @@ +2014-09-04 Paul Eggert <eggert@cs.ucla.edu> + + Less chatter in 'make' output. + * Makefile.in (clean): Simplify, for shorter command line. + 2014-08-07 Reuben Thomas <rrt@sc3d.org> * ediff.texi (Merging and diff3): Don't mention lack of support diff --git a/doc/misc/Makefile.in b/doc/misc/Makefile.in index 53537122cef..dee3eff2caf 100644 --- a/doc/misc/Makefile.in +++ b/doc/misc/Makefile.in @@ -221,8 +221,7 @@ mostlyclean: rm -f gnustmp* clean: mostlyclean - rm -f $(DVI_TARGETS) $(HTML_TARGETS) $(PDF_TARGETS) $(PS_TARGETS) - rm -f efaq-w32.dvi efaq-w32.html efaq-w32.pdf efaq-w32.ps + rm -f *.dvi *.html *.pdf *.ps rm -f emacs-misc-${version}.tar* distclean: clean diff --git a/oldXMenu/ChangeLog b/oldXMenu/ChangeLog index a1d243664e8..6c0db12e78c 100644 --- a/oldXMenu/ChangeLog +++ b/oldXMenu/ChangeLog @@ -1,3 +1,8 @@ +2014-09-04 Paul Eggert <eggert@cs.ucla.edu> + + Less chatter in 'make' output. + * Makefile.in (clean mostlyclean): Simplify, for shorter command line. + 2014-09-01 Paul Eggert <eggert@cs.ucla.edu> --enable-silent-rules now suppresses more chatter. diff --git a/oldXMenu/Makefile.in b/oldXMenu/Makefile.in index 230828157e8..3e1d49d2ea3 100644 --- a/oldXMenu/Makefile.in +++ b/oldXMenu/Makefile.in @@ -128,7 +128,7 @@ libXMenu11.a: $(OBJS) $(EXTRA) .PHONY: mostlyclean clean distclean bootstrap-clean maintainer-clean clean mostlyclean: - rm -f libXMenu11.a ${OBJS} ${EXTRA} + rm -f libXMenu11.a *.o -rm -rf ${DEPDIR} bootstrap-clean maintainer-clean distclean: clean diff --git a/src/ChangeLog b/src/ChangeLog index 4f189e5be38..f463cc71fd8 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,10 @@ +2014-09-04 Paul Eggert <eggert@cs.ucla.edu> + + Less chatter in 'make' output. + * 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. + 2014-09-03 Martin Rudalics <rudalics@gmx.at> * 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@) am__v_CCLD_0 = @echo " CCLD " $@; am__v_CCLD_1 = +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = + +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = + DEPDIR=deps ## -MMD -MF $(DEPDIR)/$*.d if AUTO_DEPEND; else empty. DEPFLAGS=@DEPFLAGS@ @@ -469,29 +479,32 @@ emacs$(EXEEXT): temacs$(EXEEXT) \ ## in the contents of the DOC file. ## $(etc)/DOC: $(libsrc)/make-docfile$(EXEEXT) $(obj) $(lisp) - $(MKDIR_P) $(etc) - -rm -f $(etc)/DOC - $(libsrc)/make-docfile -d $(srcdir) $(SOME_MACHINE_OBJECTS) $(obj) > $(etc)/DOC - $(libsrc)/make-docfile -a $(etc)/DOC -d $(lispsource) `sed -n -e 's| \\\\||' -e 's|^[ ]*$$(lispsource)/||p' $(srcdir)/lisp.mk` + $(AM_V_GEN)$(MKDIR_P) $(etc) + -$(AM_V_at)rm -f $(etc)/DOC + $(AM_V_at)$(libsrc)/make-docfile -d $(srcdir) \ + $(SOME_MACHINE_OBJECTS) $(obj) > $(etc)/DOC + $(AM_V_at)$(libsrc)/make-docfile -a $(etc)/DOC -d $(lispsource) \ + `sed -n -e 's| \\\\||' -e 's|^[ ]*$$(lispsource)/||p' \ + $(srcdir)/lisp.mk` $(libsrc)/make-docfile$(EXEEXT): $(MAKE) -C $(libsrc) make-docfile$(EXEEXT) buildobj.h: Makefile - for i in $(ALLOBJS); do \ + $(AM_V_GEN)for i in $(ALLOBJS); do \ echo "$$i" | sed 's,.*/,,; s/\.obj$$/\.o/; s/^/"/; s/$$/",/' \ || exit; \ done >$@.tmp - mv $@.tmp $@ + $(AM_V_at)mv $@.tmp $@ globals.h: gl-stamp; @true GLOBAL_SOURCES = $(base_obj:.o=.c) $(NS_OBJC_OBJ:.o=.m) gl-stamp: $(libsrc)/make-docfile$(EXEEXT) $(GLOBAL_SOURCES) - $(libsrc)/make-docfile -d $(srcdir) -g $(obj) > gl.tmp - $(top_srcdir)/build-aux/move-if-change gl.tmp globals.h - echo timestamp > $@ + $(AM_V_GEN)$(libsrc)/make-docfile -d $(srcdir) -g $(obj) > gl.tmp + $(AM_V_at)$(top_srcdir)/build-aux/move-if-change gl.tmp globals.h + $(AM_V_at)echo timestamp > $@ $(ALLOBJS): globals.h |