[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-26 1aa906f 1/3: Make 'tags' targets respect --with-s
From: |
Noam Postavsky |
Subject: |
[Emacs-diffs] emacs-26 1aa906f 1/3: Make 'tags' targets respect --with-silent-rules (Bug#31744) |
Date: |
Tue, 12 Jun 2018 07:47:39 -0400 (EDT) |
branch: emacs-26
commit 1aa906f10d3a5dc3905c2f74cddbfd8c6cb8eb7a
Author: Noam Postavsky <address@hidden>
Commit: Noam Postavsky <address@hidden>
Make 'tags' targets respect --with-silent-rules (Bug#31744)
* lwlib/Makefile.in (TAGS):
* lisp/Makefile.in (TAGS):
* src/Makefile.in (TAGS): Use AM_V_GEN and AM_V_at.
* src/Makefile.in: Note that TAGS are generated in build dir.
---
lisp/Makefile.in | 6 +++---
lwlib/Makefile.in | 2 +-
src/Makefile.in | 5 +++--
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index d4709bd..05fca95 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -259,9 +259,9 @@ ${ETAGS}: FORCE
## compile-main. But maybe this is not even necessary any more now
## that this uses relative filenames.
TAGS: ${ETAGS} ${tagsfiles}
- rm -f $@
- touch $@
- ls ${tagsfiles} | xargs $(XARGS_LIMIT) "${ETAGS}" -a -o $@
+ $(AM_V_at)rm -f $@
+ $(AM_V_at)touch $@
+ $(AM_V_GEN)ls ${tagsfiles} | xargs $(XARGS_LIMIT) "${ETAGS}" -a -o $@
# The src/Makefile.in has its own set of dependencies and when they decide
diff --git a/lwlib/Makefile.in b/lwlib/Makefile.in
index 32d7a91..6bd2608 100644
--- a/lwlib/Makefile.in
+++ b/lwlib/Makefile.in
@@ -131,6 +131,6 @@ FORCE:
.PHONY: tags FORCE
tags: TAGS
TAGS: ${ETAGS} $(ctagsfiles)
- ${ETAGS} $(ctagsfiles)
+ $(AM_V_GEN)${ETAGS} $(ctagsfiles)
### Makefile.in ends here
diff --git a/src/Makefile.in b/src/Makefile.in
index 15ca166..6ed8f3c 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -674,13 +674,14 @@ ${ETAGS}: FORCE
ctagsfiles1 = $(wildcard ${srcdir}/*.[hc])
ctagsfiles2 = $(wildcard ${srcdir}/*.m)
-## FIXME? In out-of-tree builds, should TAGS be generated in srcdir?
+## In out-of-tree builds, TAGS are generated in the build dir, like
+## other non-bootstrap build products (see Bug#31744).
## This does not need to depend on ../lisp and ../lwlib TAGS files,
## because etags "--include" only includes a pointer to the file,
## rather than the file contents.
TAGS: ${ETAGS} $(ctagsfiles1) $(ctagsfiles2)
- ${ETAGS} --include=../lisp/TAGS --include=$(lwlibdir)/TAGS \
+ $(AM_V_GEN)${ETAGS} --include=../lisp/TAGS --include=$(lwlibdir)/TAGS \
--regex='{c}/[ ]*DEFVAR_[A-Z_ (]+"\([^"]+\)"/\1/' \
--regex='{c}/[ ]*DEFVAR_[A-Z_ (]+"[^"]+",[
]\([A-Za-z0-9_]+\)/\1/' \
$(ctagsfiles1) \