From 1de0ebf2e50603859ec18cfd94472b3041d381e8 Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Wed, 5 Oct 2016 19:44:49 +0100 Subject: fix gtk install target to cope with gtk3 --- Makefile | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 9a9f4b3d6..c5c374ba1 100644 --- a/Makefile +++ b/Makefile @@ -117,7 +117,7 @@ ifeq ($(TARGET),) endif # valid values for the TARGET -VLDTARGET := riscos gtk beos amiga amigaos3 framebuffer windows atari cocoa monkey +VLDTARGET := riscos gtk gtk3 beos amiga amigaos3 framebuffer windows atari cocoa monkey # Check for valid TARGET ifeq ($(filter $(VLDTARGET),$(TARGET)),) @@ -287,7 +287,7 @@ else CXX := $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*g++) endif else - ifeq ($(findstring framebuffer,$(TARGET)),framebuffer) + ifeq ($(TARGET),framebuffer) ifeq ($(origin GCCSDK_INSTALL_ENV),undefined) PKG_CONFIG := pkg-config else @@ -299,8 +299,25 @@ else CXX := $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*g++) endif else - # All native targets (GTK) + # All native targets PKG_CONFIG := pkg-config + + # gtk target processing + ifeq ($(TARGET),gtk3) + override TARGET := gtk + override NETSURF_GTK_MAJOR := 3 + SUBTARGET = $(NETSURF_GTK_MAJOR) + else + ifeq ($(TARGET),gtk) + ifeq ($(origin NETSURF_GTK_MAJOR),undefined) + override NETSURF_GTK_MAJOR := 2 + else + ifneq ($(NETSURF_GTK_MAJOR),2) + SUBTARGET = $(NETSURF_GTK_MAJOR) + endif + endif + endif + endif endif endif endif -- cgit v1.2.3