Skip to content

Commit

Permalink
make tags fixes (pythonGH-717)
Browse files Browse the repository at this point in the history
* 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.
  • Loading branch information
dzeban authored and methane committed Mar 24, 2017
1 parent 20fbf8a commit 8a543c0
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Makefile.pre.in
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion configure
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 8a543c0

Please sign in to comment.