From 25d757535884da71ace29fd80b8b24dd3a8f9017 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sat, 22 Mar 2025 11:19:41 -0700 Subject: Remove ctags program Remove our old ctags and suggest Universal Ctags instead. This fixes a FIXME in lib-src/Makefile.in and speeds up compilation quite a bit on my older CPU when I compile with --enable-gcc-warnings. It also lessens installation and runtime footprint. (Bug#76322) * .gitignore: Remove lib-src/ctags. * admin/authors.el (authors-renamed-files-alist): Remove ctags.1. * admin/check-man-pages: ctags.1 is no longer a special case. * admin/quick-install-emacs (PUBLIC_LIBSRC_BINARIES): Remove ctags. * cross/Makefile.in (LIBSRC_BINARIES): Remove lib-src/ctags. * doc/man/ctags.1, lib-src/ctags.c: Remove. * java/Makefile.in (CROSS_LIBSRC_BINS): Remove ctags. * lib-src/Makefile.in (INSTALLABLES): Remove ctags${EXEEXT}. (ctags${EXEEXT}): Remove. * lib-src/etags.c (CTAGS): Remove. All uses replaced by ... (ctags): ... this new static var. (STDIN): Remove macro. All uses replaced by new STDIN_OPTION constant. (CTAGS_OPTION, STDIN_OPTION): New contants. (longopts): New --ctags option. (ctags_default_C_help): New constant, to override default_C_help at runtime. (default_C_help): Now always the etags version. (C_LANG_NAMES_INDEX): New macro. (print_language_names): Do not assume etags. (PROGRAM_NAME): Remove. All uses removed. (print_help): Document --ctags if PRINT_UNDOCUMENTED_OPTIONS_HELP. (main): Support new --ctags option, and support all [ce]tags options. * test/manual/etags/Makefile (CTAGS_PROG): Now etags --ctags, since there is no longer a ctags. --- java/Makefile.in | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'java') diff --git a/java/Makefile.in b/java/Makefile.in index 39d6e85c7a7..4988290a207 100644 --- a/java/Makefile.in +++ b/java/Makefile.in @@ -128,7 +128,6 @@ IS_D8_R8 := @IS_D8_R8@ # containing the following files: # lib/$(ANDROID_ABI)/libemacs.so # lib/$(ANDROID_ABI)/libandroid-emacs.so -# lib/$(ANDROID_ABI)/libctags.so # lib/$(ANDROID_ABI)/libetags.so # lib/$(ANDROID_ABI)/libhexl.so # lib/$(ANDROID_ABI)/libmovemail.so @@ -143,8 +142,7 @@ all: $(APK_NAME) # Binaries to cross-compile. CROSS_SRC_BINS := $(top_builddir)/cross/src/android-emacs -CROSS_LIBSRC_BINS := $(top_builddir)/cross/lib-src/ctags \ - $(top_builddir)/cross/lib-src/hexl \ +CROSS_LIBSRC_BINS := $(top_builddir)/cross/lib-src/hexl \ $(top_builddir)/cross/lib-src/ebrowse \ $(top_builddir)/cross/lib-src/emacsclient \ $(top_builddir)/cross/lib-src/etags -- cgit v1.2.1