From 3f2935efbab8a66c4a0751b0082808edaca1a21b Mon Sep 17 00:00:00 2001 From: Alex Dzyoba Date: Fri, 24 Mar 2017 11:23:43 +0300 Subject: [PATCH 1/2] `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) --- Makefile.pre.in | 2 +- configure | 2 +- configure.ac | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in index 2b647a8e5885f9..50ae9af1d1a021 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -1601,7 +1601,7 @@ autoconf: tags:: cd $(srcdir); \ ctags -w Include/*.h; \ - for i in $(SRCDIRS); do ctags -w -a $$i/*.[ch]; \ + for i in $(SRCDIRS); do ctags -f tags -w -a $$i/*.[ch]; \ done; \ LC_ALL=C sort -o tags tags diff --git a/configure b/configure index 24d86f59ebcbea..ea1baef55d3035 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 9a784e4636f125..fc1dba6b029158 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 From adf0b795122a2166efb99813d2e074a8fc78daf2 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Thu, 30 Nov 2017 22:49:10 +0100 Subject: [PATCH 2/2] make tags: index also Modules/_ctypes/ (#4648) Avoid also "cd $(srcdir)" to not change the current directory. (cherry picked from commit 3be3b97a9709d3cd5303175ddbffa7dcca57ac3e) --- Makefile.pre.in | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in index 50ae9af1d1a021..5e88e3f6aa1ec0 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 -f tags -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