Cygwin: revert handwritten tags/ctags target, take 2

Fix accidental checkin of the wrong test version

Signed-off-by: Corinna Vinschen <corinna@vinschen.de>

diff --git a/winsup/cygwin/Makefile.am b/winsup/cygwin/Makefile.am
index f75a10bc05ce77a85ab562a131c56f643927a8bc..c43f72ff9fa4215d9fde9eef7f60d492adb4e917 100644 (file)
--- a/winsup/cygwin/Makefile.am
+++ b/winsup/cygwin/Makefile.am
@@ -8,7 +8,7 @@
 
 # This makefile requires GNU make.
 
-#AUTOMAKE_OPTIONS=-Wno-override
+AUTOMAKE_OPTIONS=-Wno-override
 
 include $(top_srcdir)/Makefile.am.common
 
@@ -25,10 +25,6 @@ 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
 
@@ -776,11 +772,11 @@ 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/' \
-#      .
+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/' \
+       .