patch 9.2.0824: Makefile: Make tags depends on configure

Problem:  Makefile: Make tags depends on configure
Solution: Separate the make tags into a separate makefile
          (Christoffer Aasted)

closes: #20707

Signed-off-by: Christoffer Aasted <dezzadk@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/Filelist b/Filelist
index aedb16a7ffe64d2e198f18b132596e4684f99961..07853f4c690783100cf935140173c795f70a8912 100644 (file)
--- a/Filelist
+++ b/Filelist
@@ -34,6 +34,7 @@ SRC_ALL =     \
                ci/ddebs.list \
                ci/pinned-pkgs \
                src/Make_all.mak \
+               src/Make_tags.mak \
                src/README.md \
                src/alloc.c \
                src/alloc.h \

diff --git a/Makefile b/Makefile
index 2552083a51814724ff30142865285ad982b2ec81..47c41a2bb440996fde4b67fefab2c4126ff49ffc 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -30,9 +30,12 @@ first:
        @echo "If there are problems, cd to the src directory and run make there"
        cd src && $(MAKE) $@
 
+tags notags:
+       $(MAKE) -C src/ -f Make_tags.mak $@
+
 # Some make programs use the last target for the $@ default; put the other
 # targets separately to always let $@ expand to "first" by default.
-all install uninstall tools config configure reconfig proto depend lint tags types test scripttests testtiny test_libvterm unittests testclean clean distclean:
+all install uninstall tools config configure reconfig proto depend lint types test scripttests testtiny test_libvterm unittests testclean clean distclean:
        @if test ! -f src/auto/config.mk; then \
                cp src/config.mk.dist src/auto/config.mk; \
        fi

diff --git a/src/Make_all.mak b/src/Make_all.mak
index 6a6d2fe14eda485156312fca60410f1cf1a6e3ec..4f1b1255fde2dcdd9aa02959e3b3ac2a70ee0c12 100644 (file)
--- a/src/Make_all.mak
+++ b/src/Make_all.mak
@@ -1,5 +1,5 @@
 #
-# Common Makefile, defines the list of tests to run and other things.
+# Common Makefile - shared platform independent
 #
 
 # Argument for running ctags.

diff --git a/src/Make_tags.mak b/src/Make_tags.mak
new file mode 100644 (file)
index 0000000..9a17b09
--- /dev/null
+++ b/src/Make_tags.mak
@@ -0,0 +1,16 @@
+#
+# tags
+#
+
+include Make_all.mak
+-include auto/config.mk
+
+# Override with `make TAGPRG='...' tags`
+TAGPRG ?= ctags -I INIT+,INIT2+,INIT3+,INIT4+,INIT5+ --fields=+S -f tags
+
+notags:
+       -rm -f tags
+
+# You can ignore error messages for missing files.
+tags TAGS: notags
+       $(TAGPRG) $(TAGS_FILES)

diff --git a/src/Makefile b/src/Makefile
index e0f7057b8323cbacdeb27bb1428bc70410104fc8..a3878d0c852c76931a2cf8a01246cd282db49749 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -2201,12 +2201,12 @@ proto/gui_gtk_gresources.pro: auto/gui_gtk_gresources.c
        fi
 
 notags:
-       -rm -f tags
+       $(MAKE) -f Make_tags.mak notags
 
-# Note: tags is made for the currently configured version.
+# Configure sets portable TAGPRG, else modern ctags is used.
 # You can ignore error messages for missing files.
 tags TAGS: notags
-       $(TAGPRG) $(TAGS_FILES)
+       $(MAKE) -f Make_tags.mak tags
 
 # Build the cscope database.
 # This may search more files than necessary.

diff --git a/src/version.c b/src/version.c
index bdf8cac8c44f427528f966182c9778c11f32930a..80eae1f8841ee75f0e841f5c744336283903b4b9 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -759,6 +759,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    824,
 /**/
     823,
 /**/