From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <corinna@sourceware.org>
Received: by sourceware.org (Postfix, from userid 2155)
 id B4F393A64001; Thu,  6 May 2021 09:20:18 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B4F393A64001
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: Corinna Vinschen <corinna@sourceware.org>
To: cygwin-cvs@sourceware.org
Subject: [newlib-cygwin] Cygwin: revert handwritten tags/ctags target
X-Act-Checkin: newlib-cygwin
X-Git-Author: Corinna Vinschen <corinna@vinschen.de>
X-Git-Refname: refs/heads/master
X-Git-Oldrev: 895f6d2b598e5d0da020eef2edb92f215db8eb39
X-Git-Newrev: a5b24cb24156451ada08f3fd3e36b264792e85ea
Message-Id: <20210506092018.B4F393A64001@sourceware.org>
Date: Thu,  6 May 2021 09:20:18 +0000 (GMT)
X-BeenThere: cygwin-cvs@cygwin.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Cygwin core component git logs <cygwin-cvs.cygwin.com>
List-Unsubscribe: <https://cygwin.com/mailman/options/cygwin-cvs>,
 <mailto:cygwin-cvs-request@cygwin.com?subject=unsubscribe>
List-Archive: <https://cygwin.com/pipermail/cygwin-cvs/>
List-Help: <mailto:cygwin-cvs-request@cygwin.com?subject=help>
List-Subscribe: <https://cygwin.com/mailman/listinfo/cygwin-cvs>,
 <mailto:cygwin-cvs-request@cygwin.com?subject=subscribe>
X-List-Received-Date: Thu, 06 May 2021 09:20:18 -0000

https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=a5b24cb24156451ada08f3fd3e36b264792e85ea

commit a5b24cb24156451ada08f3fd3e36b264792e85ea
Author: Corinna Vinschen <corinna@vinschen.de>
Date:   Thu May 6 11:12:46 2021 +0200

    Cygwin: revert handwritten tags/ctags target
    
    Converting to automake dropped the former, handwritten tags/ctags
    target.  This leads to a couple of problems:
    
    - For no good reason the tags file gets written to the builddir
      instead of to the srcdir where it's needed.
    
    - `make tags' requires etags to exist, rather than checking if it
      exists and skipping it.
    
    - Adding the extra ctags arguments to AM_CTAGSFLAGS still results
      in a shortened tags file.
    
    (Temporary?) solution: Revert the old tags/ctags rules and silence
    the automake warnings.
    
    Signed-off-by: Corinna Vinschen <corinna@vinschen.de>

Diff:
---
 winsup/cygwin/Makefile.am | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/winsup/cygwin/Makefile.am b/winsup/cygwin/Makefile.am
index 8cde3f452..f75a10bc0 100644
--- a/winsup/cygwin/Makefile.am
+++ b/winsup/cygwin/Makefile.am
@@ -8,6 +8,8 @@
 
 # This makefile requires GNU make.
 
+#AUTOMAKE_OPTIONS=-Wno-override
+
 include $(top_srcdir)/Makefile.am.common
 
 COMMON_CFLAGS=-Wimplicit-fallthrough=5 -Werror -fmerge-constants -ftracer
@@ -23,6 +25,10 @@ if TARGET_X86_64
 AM_CCASFLAGS=-D_WIN64
 endif
 
+AM_CTAGSFLAGS=-R -f $(srcdir)/tags --c++-kinds=+p --fields=+iaS --extra=+q \
+	--regex-C++='/EXPORT_ALIAS *\([a-zA-Z0-9_]*, *([a-zA-Z0-9_]*)\)/\1/' \
+	--regex-C++='/__ASMNAME *\("([a-zA-Z0-9_]+)"\)/\1/'
+
 target_builddir=@target_builddir@
 newlib_build=$(target_builddir)/newlib
 
@@ -769,3 +775,12 @@ uninstall-headers:
 
 uninstall-ldif:
 	rm -f $(DESTDIR)$(datarootdir)/cygwin/cygwin.ldif
+
+#ctags: CTAGS
+#tags:  CTAGS
+#CTAGS:
+#	-cd $(srcdir) && \
+#	ctags -R --c++-kinds=+p --fields=+iaS --extra=+q \
+#	--regex-C++='/EXPORT_ALIAS *\([a-zA-Z0-9_]*, *([a-zA-Z0-9_]*)\)/\1/' \
+#	--regex-C++='/__ASMNAME *\("([a-zA-Z0-9_]+)"\)/\1/' \
+#	.