From fb4ce8a2e37acbdd8dd518b8c343eaaf4e4e79ef Mon Sep 17 00:00:00 2001
From: Marko Lindqvist <cazfi74@gmail.com>
Date: Sun, 19 Dec 2021 09:15:10 +0200
Subject: [PATCH 43/43] Rename gtk3x-client binary as freeciv-gtk4

See osdn #43420

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
---
 client/.gitignore                         |  2 +-
 client/Makefile.am                        | 16 ++++++++--------
 client/gui-gtk-4.0/Makefile.am            |  6 +++---
 doc/README                                |  2 +-
 doc/fr/README.fr                          |  2 +-
 scripts/diff_ignore                       |  2 +-
 windows/installer_cross/freeciv-gtk3x.cmd |  2 +-
 7 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/client/.gitignore b/client/.gitignore
index 3339fd55d3..86feda1364 100644
--- a/client/.gitignore
+++ b/client/.gitignore
@@ -1,7 +1,7 @@
 /Makefile
 /Makefile.in
 /freeciv-gtk3
-/freeciv-gtk3x
+/freeciv-gtk4
 /freeciv-gtk3.22
 /freeciv-sdl2
 /freeciv-qt
diff --git a/client/Makefile.am b/client/Makefile.am
index e523723f3f..9612f78e42 100644
--- a/client/Makefile.am
+++ b/client/Makefile.am
@@ -201,14 +201,14 @@ freeciv_gtk3_22_LDADD = \
 endif
 
 if CLIENT_GUI_GTK_3X
-bin_PROGRAMS += freeciv-gtk3x
-noinst_LTLIBRARIES += libfcgui-gtk3x.la
-libfcgui_gtk3x_la_SOURCES = $(freeciv_client_src)
-libfcgui_gtk3x_la_LIBADD = gui-gtk-4.0/libgui-gtk3x.la $(clientlibs)
-freeciv_gtk3x_SOURCES = dummy.c
-freeciv_gtk3x_LDFLAGS = $(gui_gtk3x_ldflags)
-freeciv_gtk3x_LDADD = \
- libfcgui-gtk3x.la $(SOUND_LIBS) gui-gtk-4.0/gui_main.lo \
+bin_PROGRAMS += freeciv-gtk4
+noinst_LTLIBRARIES += libfcgui-gtk4.la
+libfcgui_gtk4_la_SOURCES = $(freeciv_client_src)
+libfcgui_gtk4_la_LIBADD = gui-gtk-4.0/libgui-gtk4.la $(clientlibs)
+freeciv_gtk4_SOURCES = dummy.c
+freeciv_gtk4_LDFLAGS = $(gui_gtk3x_ldflags)
+freeciv_gtk4_LDADD = \
+ libfcgui-gtk4.la $(SOUND_LIBS) gui-gtk-4.0/gui_main.lo \
  $(top_builddir)/common/libfreeciv.la \
  $(INTLLIBS) $(CLIENT_LIBS) $(CLIENTICON) \
  $(TINYCTHR_LIBS) $(MAPIMG_WAND_LIBS) \
diff --git a/client/gui-gtk-4.0/Makefile.am b/client/gui-gtk-4.0/Makefile.am
index a099813900..ac10082f35 100644
--- a/client/gui-gtk-4.0/Makefile.am
+++ b/client/gui-gtk-4.0/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-noinst_LTLIBRARIES = libgui-gtk3x.la
+noinst_LTLIBRARIES = libgui-gtk4.la
 AM_CPPFLAGS = \
 	-I$(srcdir)/.. \
 	-I$(srcdir)/../include \
@@ -14,7 +14,7 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/dependencies/tinycthread \
 	$(gui_gtk3x_cflags) $(SOUND_CFLAGS)
 
-libgui_gtk3x_la_SOURCES = \
+libgui_gtk4_la_SOURCES = \
 	action_dialog.c \
 	canvas.c	\
 	canvas.h	\
@@ -110,4 +110,4 @@ libgui_gtk3x_la_SOURCES = \
 	wldlg.c		\
 	wldlg.h
 
-libgui_gtk3x_la_LIBADD = -lm
+libgui_gtk4_la_LIBADD = -lm
diff --git a/doc/README b/doc/README
index f403a07fe7..bc74823eef 100644
--- a/doc/README
+++ b/doc/README
@@ -92,7 +92,7 @@ freeciv-qt:  This uses the QT library. Development of this client has recently
 
 freeciv-sdl2: This uses Simple DirectMedia Layer libraries version 2.
 
-freeciv-gtk3x: This uses GTK+ 3.90+ libraries. This is development version of
+freeciv-gtk4: This uses GTK+ 3.90+ libraries. This is development version of
   a client to get turned to use gtk4 once it's released.
 
 
diff --git a/doc/fr/README.fr b/doc/fr/README.fr
index bdb91ef10d..01117f320c 100644
--- a/doc/fr/README.fr
+++ b/doc/fr/README.fr
@@ -107,7 +107,7 @@ freeciv-qt : Il utilise la librairie QT. Le développement de ce client
 
 freeciv-sdl2 : Il utilise les librairies Simple DirectMedia Layer version 2.
 
-freeciv-gtk3x : Il utilise les librairies GTK+ 3.90+. C'est une
+freeciv-gtk4 : Il utilise les librairies GTK+ 3.90+. C'est une
   version de développement d'un client qui évoluera pour utiliser GTK4
   une fois qu'il sera diffusé.
 
diff --git a/scripts/diff_ignore b/scripts/diff_ignore
index 557fc25bb7..33281c2038 100644
--- a/scripts/diff_ignore
+++ b/scripts/diff_ignore
@@ -31,7 +31,7 @@ charset.alias
 fcgui
 freeciv-gtk3
 freeciv-gtk3.22
-freeciv-gtk3x
+freeciv-gtk4
 freeciv-sdl2
 freeciv-qt
 *.sav.gz
diff --git a/windows/installer_cross/freeciv-gtk3x.cmd b/windows/installer_cross/freeciv-gtk3x.cmd
index f57bce5ffd..82f0d3358c 100755
--- a/windows/installer_cross/freeciv-gtk3x.cmd
+++ b/windows/installer_cross/freeciv-gtk3x.cmd
@@ -1,3 +1,3 @@
 @echo off
 if not "%1" == "auto" set LANG=%1
-start "%~n0" /D . "%~dp0\freeciv-gtk3x.exe" %2 %3 %4 %5 %6 %7 %8 %9
+start "%~n0" /D . "%~dp0\freeciv-gtk4.exe" %2 %3 %4 %5 %6 %7 %8 %9
-- 
2.34.1