diff options
author | Alex Dzyoba <dzeban@users.noreply.github.com> | 2017-03-24 08:23:43 (GMT) |
---|---|---|
committer | INADA Naoki <methane@users.noreply.github.com> | 2017-03-24 08:23:43 (GMT) |
commit | 8a543c0bc7347d5b333f334d157bf4a7cd33c14a (patch) | |
tree | ccf774fcc1643dceb1cecf3cdeea31cf74fca43e | |
parent | 20fbf8accd494fd15b0fc4c84928178c71ead4d1 (diff) | |
download | cpython-8a543c0bc7347d5b333f334d157bf4a7cd33c14a.zip cpython-8a543c0bc7347d5b333f334d157bf4a7cd33c14a.tar.gz cpython-8a543c0bc7347d5b333f334d157bf4a7cd33c14a.tar.bz2 |
`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.
-rw-r--r-- | Makefile.pre.in | 2 | ||||
-rwxr-xr-x | configure | 2 | ||||
-rw-r--r-- | configure.ac | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.pre.in b/Makefile.pre.in index 3da6637..4145634 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -1555,7 +1555,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 @@ -16320,7 +16320,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 aca8255..8ab1c03 100644 --- a/configure.ac +++ b/configure.ac @@ -5200,7 +5200,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 |