[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r114910: Use relative filenames in TAGS files.
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] trunk r114910: Use relative filenames in TAGS files. |
Date: |
Sat, 02 Nov 2013 19:41:40 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 114910
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sat 2013-11-02 12:41:33 -0700
message:
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.
modified:
.bzrignore bzrignore-20091227212532-2lrlpwjsfm9i221p-1
lisp/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1432
lisp/Makefile.in
makefile.in-20091113204419-o5vbwnq5f7feedwu-1831
lwlib/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1447
lwlib/Makefile.in makefile.in-20091113204419-o5vbwnq5f7feedwu-662
src/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1438
src/Makefile.in makefile.in-20091113204419-o5vbwnq5f7feedwu-631
=== modified file '.bzrignore'
--- a/.bzrignore 2013-10-04 14:27:11 +0000
+++ b/.bzrignore 2013-11-02 19:41:33 +0000
@@ -43,7 +43,6 @@
stamp_BLD
subdirs.el
TAGS
-TAGS-LISP
cxxdefs.h
# Intermediate files when making pdf versions of the manuals.
doc/**/*.aux
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2013-11-02 19:18:50 +0000
+++ b/lisp/ChangeLog 2013-11-02 19:41:33 +0000
@@ -1,5 +1,11 @@
2013-11-02 Glenn Morris <address@hidden>
+ 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.
=== modified file 'lisp/Makefile.in'
--- a/lisp/Makefile.in 2013-11-02 19:18:50 +0000
+++ b/lisp/Makefile.in 2013-11-02 19:41:33 +0000
@@ -214,25 +214,25 @@
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 @@
-rm -f ./Makefile $(lisp)/loaddefs.el~
maintainer-clean: distclean bootstrap-clean
- rm -f TAGS TAGS-LISP
+ rm -f TAGS
.PHONY: check-declare
=== modified file 'lwlib/ChangeLog'
--- a/lwlib/ChangeLog 2013-11-02 19:18:50 +0000
+++ b/lwlib/ChangeLog 2013-11-02 19:41:33 +0000
@@ -1,5 +1,9 @@
2013-11-02 Glenn Morris <address@hidden>
+ Use relative filenames in TAGS files.
+ * Makefile.in (abs_srcdir): Remove it again.
+ (ctagsfiles, TAGS): Use relative filenames.
+
* Makefile.in (abs_srcdir): New, set by configure.
(ETAGS, ctagsfiles): New variables.
(TAGS): Use ETAGS, ctagsfiles. Use absolute filenames again.
=== modified file 'lwlib/Makefile.in'
--- a/lwlib/Makefile.in 2013-11-02 19:18:50 +0000
+++ b/lwlib/Makefile.in 2013-11-02 19:41:33 +0000
@@ -23,7 +23,6 @@
# and set up to be configured by ../configure.
address@hidden@
address@hidden@
# MinGW CPPFLAGS may use this.
address@hidden@
address@hidden@
@@ -104,12 +103,10 @@
ETAGS = ../lib-src/etags
-## FIXME? Does etags need to use absolute filenames?
-## See comments in lisp/Makefile.in, src/Makefile.in.
-ctagsfiles= *.[ch]
+ctagsfiles= $(srcdir)/*.[ch]
-TAGS: $(srcdir)/$(ctagsfiles)
- "$(ETAGS)" "$(abs_srcdir)"/$(ctagsfiles)
+TAGS: $(ctagsfiles)
+ "$(ETAGS)" $(ctagsfiles)
tags: TAGS
.PHONY: tags
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2013-11-02 19:23:45 +0000
+++ b/src/ChangeLog 2013-11-02 19:41:33 +0000
@@ -1,5 +1,12 @@
2013-11-02 Glenn Morris <address@hidden>
+ Use relative filenames in TAGS files.
+ * 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.
+
* Makefile.in (abs_srcdir): New, set by configure.
(lispdir): Remove.
(maintainer-clean): Remove pointless echo. That should be in the
=== modified file 'src/Makefile.in'
--- a/src/Makefile.in 2013-11-02 19:23:45 +0000
+++ b/src/Makefile.in 2013-11-02 19:41:33 +0000
@@ -1,7 +1,7 @@
### @configure_input@
-# Copyright (C) 1985, 1987-1988, 1993-1995, 1999-2013 Free Software
-# Foundation, Inc.
+# Copyright (C) 1985, 1987-1988, 1993-1995, 1999-2013
+# Free Software Foundation, Inc.
# This file is part of GNU Emacs.
@@ -28,7 +28,6 @@
# Here are the things that we expect ../configure to edit.
# We use $(srcdir) explicitly in dependencies so as not to depend on VPATH.
srcdir = @srcdir@
-abs_srcdir = @abs_srcdir@
# MinGW CPPFLAGS may use this.
address@hidden@
ntsource = $(srcdir)/../nt
@@ -557,7 +556,7 @@
cd ../nextstep && $(MAKE) $(MFLAGS) all
.PHONY: mostlyclean clean bootstrap-clean distclean maintainer-clean
-.PHONY: versionclean extraclean frc
+.PHONY: versionclean extraclean
mostlyclean:
rm -f temacs$(EXEEXT) core *.core \#* *.o libXMenu11.a liblw.a
@@ -585,7 +584,7 @@
rm -f Makefile
maintainer-clean: distclean
- rm -f TAGS TAGS-LISP
+ rm -f TAGS
versionclean:
-rm -f emacs$(EXEEXT) emacs-*.*.*$(EXEEXT) ../etc/DOC*
extraclean: distclean
@@ -598,28 +597,27 @@
ctagsfiles2 = [a-wA-W]*.[hc]
ctagsfiles3 = [a-zA-Z]*.m
-## FIXME? Do we really need to use absolute filenames here?
+## FIXME? In out-of-tree builds, should TAGS be generated in srcdir?
## 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: $(srcdir)/$(ctagsfiles1) $(srcdir)/$(ctagsfiles2)
$(srcdir)/$(ctagsfiles3)
- "$(ETAGS)" --include=TAGS-LISP --include=$(lwlibdir)/TAGS \
+ "$(ETAGS)" --include=../lisp/TAGS --include=$(lwlibdir)/TAGS \
--regex='{c}/[ ]*DEFVAR_[A-Z_ (]+"\([^"]+\)"/' \
- "$(abs_srcdir)"/$(ctagsfiles1) "$(abs_srcdir)"/$(ctagsfiles2) \
+ $(srcdir)/$(ctagsfiles1) $(srcdir)/$(ctagsfiles2) \
--regex='{objc}/[ ]*DEFVAR_[A-Z_ (]+"\([^"]+\)"/' \
- "$(abs_srcdir)"/$(ctagsfiles3)
+ $(srcdir)/$(ctagsfiles3)
## Arrange to make tags tables for ../lisp and ../lwlib,
## which the above TAGS file for the C files includes by reference.
-frc:
-TAGS-LISP: frc
- $(MAKE) -f ../lisp/Makefile TAGS-LISP ETAGS="$(ETAGS)"
+../lisp/TAGS:
+ cd ../lisp && $(MAKE) TAGS ETAGS="$(ETAGS)"
$(lwlibdir)/TAGS:
cd $(lwlibdir) && $(MAKE) TAGS ETAGS="$(ETAGS)"
-tags: TAGS TAGS-LISP $(lwlibdir)/TAGS
+tags: TAGS ../lisp/TAGS $(lwlibdir)/TAGS
.PHONY: tags
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r114910: Use relative filenames in TAGS files.,
Glenn Morris <=