1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-26 07:33:47 +00:00

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.
This commit is contained in:
Paul Eggert 2014-09-03 19:15:56 -07:00
parent 315d21d20f
commit d1db070572
6 changed files with 41 additions and 12 deletions

View File

@ -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

View File

@ -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

View File

@ -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.

View File

@ -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

View File

@ -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.

View File

@ -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