diff options
| author | Glenn Morris <rgm@gnu.org> | 2013-11-02 12:41:33 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2013-11-02 12:41:33 -0700 |
| commit | c617f3d0b10f5a271c2d5d93d2a9422d9d7e8fb1 (patch) | |
| tree | 6a2822ea9620c91e347b605ec48436b67ef4d0a9 /lisp | |
| parent | 739f57cd1f17b92760c2631c7eec003e3a756415 (diff) | |
Use relative filenames in TAGS files.
* src/Makefile.in (abs_srcdir): Remove it again.
(.PHONY): Remove frc.
(maintainer-clean): No more TAGS-LISP file.
(TAGS): Pass relative file names to etags.
(../lisp/TAGS): Rename from TAGS-LISP. Work in ../lisp.
* lisp/Makefile.in (lisptagsfiles1, lisptagsfiles2, lisptagsfiles3)
(lisptagsfiles4, TAGS): Use relative file names.
(TAGS-LISP): Remove.
(maintainer-clean): No more TAGS-LISP file.
* lwlib/Makefile.in (abs_srcdir): Remove it again.
(ctagsfiles, TAGS): Use relative filenames.
* .bzrignore: Remove TAGS-LISP.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/Makefile.in | 24 |
2 files changed, 18 insertions, 12 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8bdf2d3a83e..4d794052fd7 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,11 @@ 2013-11-02 Glenn Morris <rgm@gnu.org> + Use relative filenames in TAGS files. + * Makefile.in (lisptagsfiles1, lisptagsfiles2, lisptagsfiles3) + (lisptagsfiles4, TAGS): Use relative file names. + (TAGS-LISP): Remove. + (maintainer-clean): No more TAGS-LISP file. + * Makefile.in (lisptagsfiles1, lisptagsfiles2, lisptagsfiles3) (lisptagsfiles4): Use absolute filenames again. (TAGS, TAGS-LISP): Not everything needs to run in one line. diff --git a/lisp/Makefile.in b/lisp/Makefile.in index be7a413b15b..1142165e9f3 100644 --- a/lisp/Makefile.in +++ b/lisp/Makefile.in @@ -214,25 +214,25 @@ update-authors: ETAGS = ../lib-src/etags -## NB We use absolute filenames because ../src/Makefile calls this via -## make -f ../lisp/Makefile. -## FIXME? Can etags work ok with relative filenames? -lisptagsfiles1 = $(abs_srcdir)/*.el -lisptagsfiles2 = $(abs_srcdir)/*/*.el -lisptagsfiles3 = $(abs_srcdir)/*/*/*.el -lisptagsfiles4 = $(abs_srcdir)/*/*/*/*.el +lisptagsfiles1 = $(srcdir)/*.el +lisptagsfiles2 = $(srcdir)/*/*.el +lisptagsfiles3 = $(srcdir)/*/*/*.el +lisptagsfiles4 = $(srcdir)/*/*/*/*.el ## Apparently the echo | sed | xargs is to stop the command line ## getting too long on MS Windows. It will make no difference on ## POSIX systems, where the shell does the globbing right away, before ## passing the expanded arguments to echo. -TAGS TAGS-LISP: $(lisptagsfiles1) $(lisptagsfiles2) $(lisptagsfiles3) $(lisptagsfiles4) +## The POSIX way would be to use find in a similar way to compile-main. +## But maybe this is not even necessary any more now that this uses +## relative filenames. +TAGS: $(lisptagsfiles1) $(lisptagsfiles2) $(lisptagsfiles3) $(lisptagsfiles4) rm -f $@ touch $@ echo $(lisptagsfiles1) $(lisptagsfiles2) $(lisptagsfiles3) $(lisptagsfiles4) | \ - sed -e 's,$(abs_srcdir)/[^ ]*loaddefs[^ ]*,,g' \ - -e 's,$(abs_srcdir)/ldefs-boot[^ ]*,,' \ - -e 's,$(abs_srcdir)/[^ ]*esh-groups.el[^ ]*,,' | \ + sed -e 's,$(srcdir)/[^ ]*loaddefs[^ ]*,,g' \ + -e 's,$(srcdir)/ldefs-boot[^ ]*,,' \ + -e 's,$(srcdir)/[^ ]*esh-groups.el[^ ]*,,' | \ xargs $(XARGS_LIMIT) "$(ETAGS)" -a -o $@ @@ -458,7 +458,7 @@ distclean: -rm -f ./Makefile $(lisp)/loaddefs.el~ maintainer-clean: distclean bootstrap-clean - rm -f TAGS TAGS-LISP + rm -f TAGS .PHONY: check-declare |