diff options
| author | Michael Drake <michael.drake@codethink.co.uk> | 2019-12-02 10:39:39 +0000 |
|---|---|---|
| committer | Michael Drake <michael.drake@codethink.co.uk> | 2019-12-02 10:39:39 +0000 |
| commit | 2c953cdf97171ab84e2756f59073839ea20ca74c (patch) | |
| tree | 692c2dc595c4f6647252f4a120bf37a8a6eb5e02 | |
| parent | b9cb2cab0bf34f34dfcfb3b59fa659a41ed7c54c (diff) | |
| download | netsurf-2c953cdf97171ab84e2756f59073839ea20ca74c.tar.gz netsurf-2c953cdf97171ab84e2756f59073839ea20ca74c.tar.bz2 | |
Buildsystem: GTK: Change gtk target to gtk2, which builds nsgtk2.
| -rw-r--r-- | Makefile | 7 | ||||
| -rw-r--r-- | frontends/gtk/Makefile | 8 |
2 files changed, 5 insertions, 10 deletions
@@ -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 |