From 2c953cdf97171ab84e2756f59073839ea20ca74c Mon Sep 17 00:00:00 2001
From: Michael Drake <michael.drake@codethink.co.uk>
Date: Mon, 2 Dec 2019 10:39:39 +0000
Subject: Buildsystem: GTK: Change gtk target to gtk2, which builds nsgtk2.

---
 Makefile               | 7 ++++---
 frontends/gtk/Makefile | 8 +-------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index ebde9dc93..899dfeef9 100644
--- a/Makefile
+++ b/Makefile
@@ -105,11 +105,11 @@ endif
 
 # Default target is GTK backend
 ifeq ($(TARGET),)
-  TARGET := gtk
+  TARGET := gtk2
 endif
 
 # valid values for the TARGET
-VLDTARGET := riscos gtk gtk3 beos amiga amigaos3 framebuffer windows atari monkey
+VLDTARGET := riscos gtk2 gtk3 beos amiga amigaos3 framebuffer windows atari monkey
 
 # Check for valid TARGET
 ifeq ($(filter $(VLDTARGET),$(TARGET)),)
@@ -301,7 +301,8 @@ else
                   override NETSURF_GTK_MAJOR := 3
                   SUBTARGET = $(NETSURF_GTK_MAJOR)
                 else
-	          ifeq ($(TARGET),gtk)
+	          ifeq ($(TARGET),gtk2)
+                    override TARGET := gtk
                     ifeq ($(origin NETSURF_GTK_MAJOR),undefined)
                       override NETSURF_GTK_MAJOR := 2
                     else
diff --git a/frontends/gtk/Makefile b/frontends/gtk/Makefile
index ae2e856ab..ec9889ea0 100644
--- a/frontends/gtk/Makefile
+++ b/frontends/gtk/Makefile
@@ -59,13 +59,7 @@ LDFLAGS += -lm
 NSGTK_RESOURCES_DIR := $(FRONTEND_RESOURCES_DIR)
 
 # The gtk binary target.
-ifeq ($(NETSURF_GTK_MAJOR),2)
-    # gtk2 builds have no major suffix
-    EXETARGET := nsgtk
-else
-    # gtk3 and later builds use the major version suffix
-    EXETARGET := nsgtk$(NETSURF_GTK_MAJOR)
-endif
+EXETARGET := nsgtk$(NETSURF_GTK_MAJOR)
 
 # The filter and target for split messages
 MESSAGES_FILTER=gtk
-- 
cgit v1.2.3