From c433bad3a2cdc9296a678cc9b4874c9beab05e67 Mon Sep 17 00:00:00 2001 From: Alex Dzyoba Date: Sun, 19 Mar 2017 19:14:54 +0300 Subject: [PATCH 1/2] 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`. --- configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 67cd4f4fa37f29..ece8caba0ef02e 100755 --- a/configure +++ b/configure @@ -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 6e78bb64d7e951..b9fa3c4bdf624c 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 From a5b11aefda2a4f51c4b6e1269eb0042c5582878f Mon Sep 17 00:00:00 2001 From: Alex Dzyoba Date: Sun, 19 Mar 2017 19:15:46 +0300 Subject: [PATCH 2/2] 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. --- Makefile.pre.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.pre.in b/Makefile.pre.in index 3da663762972ad..4145634c032d54 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