Buildsystem: GTK: Change gtk target to gtk2, which builds nsgtk2.

This commit is contained in:
Michael Drake 2019-12-02 10:39:39 +00:00
parent b9cb2cab0b
commit 2c953cdf97
2 changed files with 5 additions and 10 deletions

View File

@ -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

View File

@ -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