From: Victor Stinner <victor.stinner@gmail.com>
Date: Thu, 30 Nov 2017 22:34:21 +0000 (+0100)
Subject: [3.6] make tags: index also Modules/_ctypes/ (#4648) (#4659)
X-Git-Tag: v3.6.4rc1~18
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=29cb50ba347d9dc18e0720bef8e9caedd012a3cd;p=python

[3.6] make tags: index also Modules/_ctypes/ (#4648) (#4659)

* `make tags` fixes (GH-717)

* Fix `make tags` warnings

`make tags` target tries to find C sources and headers in "Grammar" and
"Mac" folders and generates these warnings:

    ctags: Warning: cannot open source file "Grammar/*.[ch]" : No such file or directory
    ctags: Warning: cannot open source file "Mac/*.[ch]" : No such file or directory

This commit changes $SRCDIRS variable in configure.ac to remote these
directories. This variable is used only for tags generation.

Also, "configure" was regenerated with `autoreconf`.

* Fix `make tags` fail on non-default tag names

When ctags overrides default tags filename (e.g. `-f .tags`) `make tags`
is failed because it assumes to see default `tags` filename:

    sort: cannot read: tags: No such file or directory

This commit explicitly specifies "tags" filename for tags generation.

(cherry picked from commit 8a543c0bc7347d5b333f334d157bf4a7cd33c14a)

* make tags: index also Modules/_ctypes/ (#4648)

Avoid also "cd $(srcdir)" to not change the current directory.

(cherry picked from commit 3be3b97a9709d3cd5303175ddbffa7dcca57ac3e)
---

diff --git a/Makefile.pre.in b/Makefile.pre.in
index 2b647a8e58..5e88e3f6aa 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -1599,10 +1599,9 @@ autoconf:
 
 # Create a tags file for vi
 tags::
-	cd $(srcdir); \
-	ctags -w Include/*.h; \
-	for i in $(SRCDIRS); do ctags -w -a $$i/*.[ch]; \
-	done; \
+	ctags -w $(srcdir)/Include/*.h
+	for i in $(SRCDIRS); do ctags -f tags -w -a $(srcdir)/$$i/*.[ch]; done
+	ctags -f tags -w -a $(srcdir)/Modules/_ctypes/*.[ch]
 	LC_ALL=C sort -o tags tags
 
 # Create a tags file for GNU Emacs
diff --git a/configure b/configure
index 24d86f59eb..ea1baef55d 100755
--- a/configure
+++ b/configure
@@ -16553,7 +16553,7 @@ do
 done
 
 
-SRCDIRS="Parser Grammar Objects Python Modules Mac Programs"
+SRCDIRS="Parser Objects Python Modules Programs"
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for build directories" >&5
 $as_echo_n "checking for build directories... " >&6; }
 for dir in $SRCDIRS; do
diff --git a/configure.ac b/configure.ac
index 9a784e4636..fc1dba6b02 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5302,7 +5302,7 @@ do
 done
 
 AC_SUBST(SRCDIRS)
-SRCDIRS="Parser Grammar Objects Python Modules Mac Programs"
+SRCDIRS="Parser Objects Python Modules Programs"
 AC_MSG_CHECKING(for build directories)
 for dir in $SRCDIRS; do
     if test ! -d $dir; then