From 7e3507cfc48cdeec6b131922826f8379218710ae Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Wed, 31 Dec 2014 11:59:02 -0800 Subject: [PATCH] Less 'make' chatter for doc and lisp [doc/emacs/ChangeLog] Less 'make' chatter for Emacs doc * Makefile.in (AM_DEFAULT_VERBOSITY, AM_V_GEN, am__v_GEN_) (am__v_GEN_0, am__v_GEN_1): New macros, from ../../src/Makefile.in. (ENVADD, $(buildinfodir)/emacs.info, emacs.html): Use them. [doc/lispintro/ChangeLog] Less 'make' chatter for Emacs doc * Makefile.in (AM_DEFAULT_VERBOSITY, AM_V_GEN, am__v_GEN_) (am__v_GEN_0, am__v_GEN_1): New macros, from ../../src/Makefile.in. (ENVADD, $(buildinfodir)/eintr.info, emacs-lisp-intro.html): Use them. [doc/lispref/ChangeLog] Less 'make' chatter for Emacs doc * Makefile.in (AM_DEFAULT_VERBOSITY, AM_V_GEN, am__v_GEN_) (am__v_GEN_0, am__v_GEN_1): New macros, from ../../src/Makefile.in. (ENVADD, $(buildinfodir)/elisp.info, elisp.html): Use them. [doc/misc/ChangeLog] Less 'make' chatter for Emacs doc * Makefile.in (AM_DEFAULT_VERBOSITY, AM_V_GEN, am__v_GEN_) (am__v_GEN_0, am__v_GEN_1): New macros, from ../../src/Makefile.in. (ENVADD, $(buildinfodir)/%.info, %.html, ${buildinfodir}/ccmode.info) (${buildinfodir}/efaq%.info, efaq%.html): Use them. [lisp/ChangeLog] Less 'make' chatter in lisp directory * Makefile.in (AM_DEFAULT_VERBOSITY, AM_V_GEN, am__v_GEN_) (am__v_GEN_0, am__v_GEN_1): New macros, from ../src/Makefile.in. (custom-deps, finder-data, autoloads, update-subdirs): Use them. --- doc/emacs/ChangeLog | 8 ++++++++ doc/emacs/Makefile.in | 13 ++++++++++--- doc/lispintro/ChangeLog | 8 ++++++++ doc/lispintro/Makefile.in | 17 +++++++++++++---- doc/lispref/ChangeLog | 8 ++++++++ doc/lispref/Makefile.in | 17 +++++++++++++---- doc/misc/ChangeLog | 9 +++++++++ doc/misc/Makefile.in | 22 ++++++++++++++++------ lisp/ChangeLog | 7 +++++++ lisp/Makefile.in | 16 ++++++++++++---- 10 files changed, 104 insertions(+), 21 deletions(-) diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index 0016ee074ad..9299e138d64 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,3 +1,11 @@ +2014-12-31 Paul Eggert + + Less 'make' chatter for Emacs doc + * Makefile.in (AM_DEFAULT_VERBOSITY, AM_V_GEN, am__v_GEN_) + (am__v_GEN_0, am__v_GEN_1): New macros, from ../../src/Makefile.in. + (ENVADD, $(buildinfodir)/emacs.info, emacs.html): + Use them. + 2014-12-27 Eli Zaretskii * buffers.texi (Kill Buffer): Improve indexing. diff --git a/doc/emacs/Makefile.in b/doc/emacs/Makefile.in index 5e53c07451b..8384db02b8e 100644 --- a/doc/emacs/Makefile.in +++ b/doc/emacs/Makefile.in @@ -73,8 +73,15 @@ TEXI2DVI = texi2dvi TEXI2PDF = texi2pdf DVIPS = dvips +# 'make' verbosity. +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -ENVADD = TEXINPUTS="$(srcdir):$(texinfodir):$(TEXINPUTS)" \ +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 = + +ENVADD = $(AM_V_GEN)TEXINPUTS="$(srcdir):$(texinfodir):$(TEXINPUTS)" \ MAKEINFO="$(MAKEINFO) $(MAKEINFO_OPTS)" DVI_TARGETS = emacs.dvi emacs-xtra.dvi @@ -162,7 +169,7 @@ ${buildinfodir}: # There is no provision for Info files to exist in the build directory. # In a distribution of Emacs, the Info files should be up to date. $(buildinfodir)/emacs.info: ${EMACSSOURCES} | ${buildinfodir} - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ $< + $(AM_V_GEN)$(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ $< emacs.dvi: ${EMACSSOURCES} $(ENVADD) $(TEXI2DVI) $< @@ -171,7 +178,7 @@ emacs.pdf: ${EMACSSOURCES} $(ENVADD) $(TEXI2PDF) $< emacs.html: ${EMACSSOURCES} - $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ $< + $(AM_V_GEN)$(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ $< emacs-xtra.dvi: $(EMACS_XTRA) $(ENVADD) $(TEXI2DVI) $< diff --git a/doc/lispintro/ChangeLog b/doc/lispintro/ChangeLog index 572875c151a..2a44153a6b8 100644 --- a/doc/lispintro/ChangeLog +++ b/doc/lispintro/ChangeLog @@ -1,3 +1,11 @@ +2014-12-31 Paul Eggert + + Less 'make' chatter for Emacs doc + * Makefile.in (AM_DEFAULT_VERBOSITY, AM_V_GEN, am__v_GEN_) + (am__v_GEN_0, am__v_GEN_1): New macros, from ../../src/Makefile.in. + (ENVADD, $(buildinfodir)/eintr.info, emacs-lisp-intro.html): + Use them. + 2014-11-09 Glenn Morris * Makefile.in (version): Remove variable. diff --git a/doc/lispintro/Makefile.in b/doc/lispintro/Makefile.in index 4bcbb53ad9a..89ee37809fb 100644 --- a/doc/lispintro/Makefile.in +++ b/doc/lispintro/Makefile.in @@ -55,8 +55,17 @@ TEXI2DVI = texi2dvi TEXI2PDF = texi2pdf DVIPS = dvips -ENVADD = TEXINPUTS="$(srcdir):$(texinfodir):$(emacsdir):$(TEXINPUTS)" \ - MAKEINFO="$(MAKEINFO) $(MAKEINFO_OPTS)" +# 'make' verbosity. +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ + +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 = + +ENVADD = \ + $(AM_V_GEN)TEXINPUTS="$(srcdir):$(texinfodir):$(emacsdir):$(TEXINPUTS)" \ + MAKEINFO="$(MAKEINFO) $(MAKEINFO_OPTS)" DVI_TARGETS = emacs-lisp-intro.dvi HTML_TARGETS = emacs-lisp-intro.html @@ -83,7 +92,7 @@ ${buildinfodir}: # The file name eintr must fit within 5 characters, to allow for # -NN extensions to fit into DOS 8+3 limits without clashing. ${buildinfodir}/eintr.info: ${srcs} | ${buildinfodir} - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ $< + $(AM_V_GEN)$(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ $< emacs-lisp-intro.dvi: ${srcs} $(ENVADD) $(TEXI2DVI) $< @@ -92,7 +101,7 @@ emacs-lisp-intro.pdf: ${srcs} $(ENVADD) $(TEXI2PDF) $< emacs-lisp-intro.html: ${srcs} - $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ $< + $(AM_V_GEN)$(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ $< emacs-lisp-intro.ps: emacs-lisp-intro.dvi $(DVIPS) -o $@ $< diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index c9f576af5e6..bb4f1835868 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,3 +1,11 @@ +2014-12-31 Paul Eggert + + Less 'make' chatter for Emacs doc + * Makefile.in (AM_DEFAULT_VERBOSITY, AM_V_GEN, am__v_GEN_) + (am__v_GEN_0, am__v_GEN_1): New macros, from ../../src/Makefile.in. + (ENVADD, $(buildinfodir)/elisp.info, elisp.html): + Use them. + 2014-12-30 Martin Rudalics * display.texi (Temporary Displays): Amend description of diff --git a/doc/lispref/Makefile.in b/doc/lispref/Makefile.in index 11cc0ecc10e..ab9abeff80c 100644 --- a/doc/lispref/Makefile.in +++ b/doc/lispref/Makefile.in @@ -59,8 +59,17 @@ TEXI2DVI = texi2dvi TEXI2PDF = texi2pdf DVIPS = dvips -ENVADD = TEXINPUTS="$(srcdir):$(texinfodir):$(emacsdir):$(TEXINPUTS)" \ - MAKEINFO="$(MAKEINFO) $(MAKEINFO_OPTS)" +# 'make' verbosity. +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ + +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 = + +ENVADD = \ + $(AM_V_GEN)TEXINPUTS="$(srcdir):$(texinfodir):$(emacsdir):$(TEXINPUTS)" \ + MAKEINFO="$(MAKEINFO) $(MAKEINFO_OPTS)" DVI_TARGETS = elisp.dvi HTML_TARGETS = elisp.html @@ -137,13 +146,13 @@ ${buildinfodir}: ${MKDIR_P} $@ $(buildinfodir)/elisp.info: $(srcs) | ${buildinfodir} - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ $< + $(AM_V_GEN)$(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ $< elisp.dvi: $(srcs) $(ENVADD) $(TEXI2DVI) $< elisp.html: $(srcs) - $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ $< + $(AM_V_GEN)$(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ $< elisp.pdf: $(srcs) $(ENVADD) $(TEXI2PDF) $< diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index 95e6a1c08b4..285d5b32a88 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,3 +1,12 @@ +2014-12-31 Paul Eggert + + Less 'make' chatter for Emacs doc + * Makefile.in (AM_DEFAULT_VERBOSITY, AM_V_GEN, am__v_GEN_) + (am__v_GEN_0, am__v_GEN_1): New macros, from ../../src/Makefile.in. + (ENVADD, $(buildinfodir)/%.info, %.html, ${buildinfodir}/ccmode.info) + (${buildinfodir}/efaq%.info, efaq%.html): + Use them. + 2014-12-18 Eric Abrahamsen * gnus.texi (Gnus Registry Setup): Explain pruning changes. Mention diff --git a/doc/misc/Makefile.in b/doc/misc/Makefile.in index 40a072a7978..aff1f13df0c 100644 --- a/doc/misc/Makefile.in +++ b/doc/misc/Makefile.in @@ -96,7 +96,15 @@ TEXI2DVI = texi2dvi TEXI2PDF = texi2pdf DVIPS = dvips -ENVADD = TEXINPUTS="$(srcdir):$(emacsdir):$(TEXINPUTS)" \ +# 'make' verbosity. +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ + +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 = + +ENVADD = $(AM_V_GEN)TEXINPUTS="$(srcdir):$(emacsdir):$(TEXINPUTS)" \ MAKEINFO="$(MAKEINFO) $(MAKEINFO_OPTS)" gfdl = ${srcdir}/doclicense.texi @@ -133,7 +141,8 @@ ${buildinfodir}: EXTRA_OPTS = ${buildinfodir}/%.info: ${srcdir}/%.texi ${gfdl} | ${buildinfodir} - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) $(EXTRA_OPTS) -o $@ $< + $(AM_V_GEN)$(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) $(EXTRA_OPTS) \ + -o $@ $< ## The short aliases, eg efaq = $(buildinfodir)/efaq.info. define info_template @@ -153,7 +162,8 @@ $(foreach ifile,$(filter-out info.info,$(INFO_TARGETS)),$(eval $(call info_templ $(ENVADD) $(TEXI2PDF) $< %.html: ${srcdir}/%.texi ${gfdl} - $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) $(EXTRA_OPTS) -o $@ $< + $(AM_V_GEN)$(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) $(EXTRA_OPTS) \ + -o $@ $< %.ps: %.dvi $(DVIPS) -o $@ $< @@ -175,12 +185,12 @@ $(buildinfodir)/semantic.info semantic.dvi semantic.pdf semantic.html: ${srcdir} ## Please can we just rename cc-mode.texi to ccmode.texi... ${buildinfodir}/ccmode.info: ${srcdir}/cc-mode.texi ${gfdl} | ${buildinfodir} - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ $< + $(AM_V_GEN)$(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ $< ## efaq, efaq_w32 do not depend on gfdl. ## Maybe we can use .SECONDEXPANSION for this. ${buildinfodir}/efaq%.info: ${srcdir}/efaq%.texi | ${buildinfodir} - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ $< + $(AM_V_GEN)$(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ $< efaq%.dvi: ${srcdir}/efaq%.texi $(ENVADD) $(TEXI2DVI) $< @@ -189,7 +199,7 @@ efaq%.pdf: ${srcdir}/efaq%.texi $(ENVADD) $(TEXI2PDF) $< efaq%.html: ${srcdir}/efaq%.texi - $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ $< + $(AM_V_GEN)$(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ $< ${buildinfodir}/emacs-mime.info emacs-mime.html: EXTRA_OPTS = --enable-encoding diff --git a/lisp/ChangeLog b/lisp/ChangeLog index acafe24674a..ca7a3c45818 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2014-12-31 Paul Eggert + + Less 'make' chatter in lisp directory + * Makefile.in (AM_DEFAULT_VERBOSITY, AM_V_GEN, am__v_GEN_) + (am__v_GEN_0, am__v_GEN_1): New macros, from ../src/Makefile.in. + (custom-deps, finder-data, autoloads, update-subdirs): Use them. + 2014-12-31 Filipp Gunbin * info.el (info-display-manual): Limit the completion alternatives diff --git a/lisp/Makefile.in b/lisp/Makefile.in index ba2a2292cbd..41c0c8e7766 100644 --- a/lisp/Makefile.in +++ b/lisp/Makefile.in @@ -28,6 +28,14 @@ VPATH = $(srcdir) # limitation. XARGS_LIMIT = @XARGS_LIMIT@ +# 'make' verbosity. +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ + +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 = + # You can specify a different executable on the make command line, # e.g. "make EMACS=../src/emacs ...". @@ -156,7 +164,7 @@ all: compile-main $(lisp)/cus-load.el $(lisp)/finder-inf.el $(lisp)/cus-load.el: $(MAKE) custom-deps custom-deps: - $(setwins_almost); \ + $(AM_V_GEN)$(setwins_almost); \ echo Directories: $$wins; \ $(emacs) -l cus-dep \ --eval '(setq generated-custom-dependencies-file (unmsys--file-name "$(srcdir)/cus-load.el"))' \ @@ -165,7 +173,7 @@ custom-deps: $(lisp)/finder-inf.el: $(MAKE) finder-data finder-data: - $(setwins_finder); \ + $(AM_V_GEN)$(setwins_finder); \ echo Directories: $$wins; \ $(emacs) -l finder \ --eval '(setq generated-finder-keywords-file (unmsys--file-name "$(srcdir)/finder-inf.el"))' \ @@ -178,7 +186,7 @@ finder-data: # If you want to allow autoloads in such files, remove that, # and make this depend on leim. autoloads: $(LOADDEFS) - $(setwins_almost); \ + $(AM_V_GEN)$(setwins_almost); \ echo Directories: $$wins; \ $(emacs) -l autoload \ --eval '(setq autoload-ensure-writable t)' \ @@ -191,7 +199,7 @@ autoloads: $(LOADDEFS) $(lisp)/subdirs.el: $(MAKE) update-subdirs update-subdirs: - $(setwins_for_subdirs); \ + $(AM_V_GEN)$(setwins_for_subdirs); \ for file in $$wins; do \ $(srcdir)/../build-aux/update-subdirs $$file; \ done; -- 2.39.2