patch 9.2.0449: Make proto fails in non GTK builds

Problem:  Make proto fails when not building the GTK gui
Solution: Test for $GLIB_COMPILE_RESOURCES as done elsewhere

closes: #20145

Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/src/Makefile b/src/Makefile
index 2a8ff097bdee9a570bc9646215c21792b335aeaa..97200a6b07906abb8ff01f53bea0c31e151c8c3c 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -2152,7 +2152,9 @@ proto/%.pro: %.c
        @$(PYTHON) $(GEN_PROTO_CMD) $< $(GEN_PROTO_ARG)
 
 proto/gui_gtk_gresources.pro: auto/gui_gtk_gresources.c
-       @$(PYTHON) $(GEN_PROTO_CMD) $< $(GEN_PROTO_ARG)
+       @if test -n "$(GLIB_COMPILE_RESOURCES)"; then \
+               $(PYTHON) $(GEN_PROTO_CMD) $< $(GEN_PROTO_ARG) ; \
+       fi
 
 notags:
        -rm -f tags
@@ -3175,7 +3177,9 @@ GUI_GTK_RES_INPUTS = \
        ../pixmaps/stock_vim_window_split_vertical.png
 
 auto/gui_gtk_gresources.c: gui_gtk_res.xml $(GUI_GTK_RES_INPUTS)
-       $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=../pixmaps --generate --c-name=gui_gtk --manual-register gui_gtk_res.xml
+       if test -z "$(GLIB_COMPILE_RESOURCES)"; then touch $@; else \
+               $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=../pixmaps --generate --c-name=gui_gtk --manual-register gui_gtk_res.xml; \
+       fi
 auto/gui_gtk_gresources.h: gui_gtk_res.xml $(GUI_GTK_RES_INPUTS)
        if test -z "$(GLIB_COMPILE_RESOURCES)"; then touch $@; else \
                $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=../pixmaps --generate --c-name=gui_gtk --manual-register gui_gtk_res.xml; \

diff --git a/src/version.c b/src/version.c
index 0c23e6a5189411cc6f0197d58334b27a56e44384..3cbce87d872b622b275ed53d13e9d1e7b69010ed 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    449,
 /**/
     448,
 /**/