Skip to content

Commit 29cb50b

Browse files
authored
[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 8a543c0) * make tags: index also Modules/_ctypes/ (#4648) Avoid also "cd $(srcdir)" to not change the current directory. (cherry picked from commit 3be3b97)
1 parent 8cd3108 commit 29cb50b

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

Makefile.pre.in

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1599,10 +1599,9 @@ autoconf:
15991599

16001600
# Create a tags file for vi
16011601
tags::
1602-
cd $(srcdir); \
1603-
ctags -w Include/*.h; \
1604-
for i in $(SRCDIRS); do ctags -w -a $$i/*.[ch]; \
1605-
done; \
1602+
ctags -w $(srcdir)/Include/*.h
1603+
for i in $(SRCDIRS); do ctags -f tags -w -a $(srcdir)/$$i/*.[ch]; done
1604+
ctags -f tags -w -a $(srcdir)/Modules/_ctypes/*.[ch]
16061605
LC_ALL=C sort -o tags tags
16071606

16081607
# Create a tags file for GNU Emacs

configure

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16553,7 +16553,7 @@ do
1655316553
done
1655416554

1655516555

16556-
SRCDIRS="Parser Grammar Objects Python Modules Mac Programs"
16556+
SRCDIRS="Parser Objects Python Modules Programs"
1655716557
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for build directories" >&5
1655816558
$as_echo_n "checking for build directories... " >&6; }
1655916559
for dir in $SRCDIRS; do

configure.ac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5302,7 +5302,7 @@ do
53025302
done
53035303

53045304
AC_SUBST(SRCDIRS)
5305-
SRCDIRS="Parser Grammar Objects Python Modules Mac Programs"
5305+
SRCDIRS="Parser Objects Python Modules Programs"
53065306
AC_MSG_CHECKING(for build directories)
53075307
for dir in $SRCDIRS; do
53085308
if test ! -d $dir; then

0 commit comments

Comments
 (0)