diff options
| author | Noam Postavsky | 2017-12-07 04:31:47 -0500 |
|---|---|---|
| committer | Noam Postavsky | 2018-06-12 07:26:06 -0400 |
| commit | 1aa906f10d3a5dc3905c2f74cddbfd8c6cb8eb7a (patch) | |
| tree | afd9c6f5e765556ec42d69043f3cdd311253a43d | |
| parent | 642c11fdd179c9b7de32c4c83bf17b073dcdd527 (diff) | |
| download | emacs-1aa906f10d3a5dc3905c2f74cddbfd8c6cb8eb7a.tar.gz emacs-1aa906f10d3a5dc3905c2f74cddbfd8c6cb8eb7a.zip | |
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.
| -rw-r--r-- | lisp/Makefile.in | 6 | ||||
| -rw-r--r-- | lwlib/Makefile.in | 2 | ||||
| -rw-r--r-- | src/Makefile.in | 5 |
3 files changed, 7 insertions, 6 deletions
diff --git a/lisp/Makefile.in b/lisp/Makefile.in index d4709bd79d4..05fca9579f9 100644 --- a/lisp/Makefile.in +++ b/lisp/Makefile.in | |||
| @@ -259,9 +259,9 @@ ${ETAGS}: FORCE | |||
| 259 | ## compile-main. But maybe this is not even necessary any more now | 259 | ## compile-main. But maybe this is not even necessary any more now |
| 260 | ## that this uses relative filenames. | 260 | ## that this uses relative filenames. |
| 261 | TAGS: ${ETAGS} ${tagsfiles} | 261 | TAGS: ${ETAGS} ${tagsfiles} |
| 262 | rm -f $@ | 262 | $(AM_V_at)rm -f $@ |
| 263 | touch $@ | 263 | $(AM_V_at)touch $@ |
| 264 | ls ${tagsfiles} | xargs $(XARGS_LIMIT) "${ETAGS}" -a -o $@ | 264 | $(AM_V_GEN)ls ${tagsfiles} | xargs $(XARGS_LIMIT) "${ETAGS}" -a -o $@ |
| 265 | 265 | ||
| 266 | 266 | ||
| 267 | # The src/Makefile.in has its own set of dependencies and when they decide | 267 | # 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 32d7a91f9b0..6bd26083816 100644 --- a/lwlib/Makefile.in +++ b/lwlib/Makefile.in | |||
| @@ -131,6 +131,6 @@ FORCE: | |||
| 131 | .PHONY: tags FORCE | 131 | .PHONY: tags FORCE |
| 132 | tags: TAGS | 132 | tags: TAGS |
| 133 | TAGS: ${ETAGS} $(ctagsfiles) | 133 | TAGS: ${ETAGS} $(ctagsfiles) |
| 134 | ${ETAGS} $(ctagsfiles) | 134 | $(AM_V_GEN)${ETAGS} $(ctagsfiles) |
| 135 | 135 | ||
| 136 | ### Makefile.in ends here | 136 | ### Makefile.in ends here |
diff --git a/src/Makefile.in b/src/Makefile.in index 15ca1667d65..6ed8f3cc916 100644 --- a/src/Makefile.in +++ b/src/Makefile.in | |||
| @@ -674,13 +674,14 @@ ${ETAGS}: FORCE | |||
| 674 | ctagsfiles1 = $(wildcard ${srcdir}/*.[hc]) | 674 | ctagsfiles1 = $(wildcard ${srcdir}/*.[hc]) |
| 675 | ctagsfiles2 = $(wildcard ${srcdir}/*.m) | 675 | ctagsfiles2 = $(wildcard ${srcdir}/*.m) |
| 676 | 676 | ||
| 677 | ## FIXME? In out-of-tree builds, should TAGS be generated in srcdir? | 677 | ## In out-of-tree builds, TAGS are generated in the build dir, like |
| 678 | ## other non-bootstrap build products (see Bug#31744). | ||
| 678 | 679 | ||
| 679 | ## This does not need to depend on ../lisp and ../lwlib TAGS files, | 680 | ## This does not need to depend on ../lisp and ../lwlib TAGS files, |
| 680 | ## because etags "--include" only includes a pointer to the file, | 681 | ## because etags "--include" only includes a pointer to the file, |
| 681 | ## rather than the file contents. | 682 | ## rather than the file contents. |
| 682 | TAGS: ${ETAGS} $(ctagsfiles1) $(ctagsfiles2) | 683 | TAGS: ${ETAGS} $(ctagsfiles1) $(ctagsfiles2) |
| 683 | ${ETAGS} --include=../lisp/TAGS --include=$(lwlibdir)/TAGS \ | 684 | $(AM_V_GEN)${ETAGS} --include=../lisp/TAGS --include=$(lwlibdir)/TAGS \ |
| 684 | --regex='{c}/[ ]*DEFVAR_[A-Z_ (]+"\([^"]+\)"/\1/' \ | 685 | --regex='{c}/[ ]*DEFVAR_[A-Z_ (]+"\([^"]+\)"/\1/' \ |
| 685 | --regex='{c}/[ ]*DEFVAR_[A-Z_ (]+"[^"]+",[ ]\([A-Za-z0-9_]+\)/\1/' \ | 686 | --regex='{c}/[ ]*DEFVAR_[A-Z_ (]+"[^"]+",[ ]\([A-Za-z0-9_]+\)/\1/' \ |
| 686 | $(ctagsfiles1) \ | 687 | $(ctagsfiles1) \ |