Get rid of ZATHURA_GTK_VERSION

Signed-off-by: Sebastian Ramacher <sebastian+dev@ramacher.at>

Makefile

@@ -9,17 +9,17 @@ HEADER     = $(wildcard *.h)
 HEADERINST = version.h document.h macros.h page.h types.h plugin-api.h links.h
 
 ifneq (${WITH_SQLITE},0)
-INCS   += $(SQLITE_INC)
-LIBS   += $(SQLITE_LIB)
-SOURCE = $(OSOURCE)
+INCS     += $(SQLITE_INC)
+LIBS     += $(SQLITE_LIB)
+SOURCE    = $(OSOURCE)
 CPPFLAGS += -DWITH_SQLITE
 else
-SOURCE = $(filter-out database-sqlite.c,$(OSOURCE))
+SOURCE    = $(filter-out database-sqlite.c,$(OSOURCE))
 endif
 
 ifneq ($(WITH_MAGIC),0)
-INCS += $(MAGIC_INC)
-LIBS += $(MAGIC_LIB)
+INCS     += $(MAGIC_INC)
+LIBS     += $(MAGIC_LIB)
 CPPFLAGS += -DWITH_MAGIC
 endif
 
@@ -125,7 +125,7 @@ ${PROJECT}.pc: ${PROJECT}.pc.in config.mk
 	$(QUIET)echo abiversion=${ZATHURA_ABI_VERSION} >> ${PROJECT}.pc
 	$(QUIET)echo includedir=${INCLUDEDIR} >> ${PROJECT}.pc
 	$(QUIET)echo plugindir=${PLUGINDIR} >> ${PROJECT}.pc
-	$(QUIET)echo GTK_VERSION=${ZATHURA_GTK_VERSION} >> ${PROJECT}.pc
+	$(QUIET)echo GTK_VERSION=3 >> ${PROJECT}.pc
 	$(QUIET)cat ${PROJECT}.pc.in >> ${PROJECT}.pc
 
 valgrind: debug

config.mk

@@ -10,24 +10,21 @@ ZATHURA_API_VERSION = 2
 ZATHURA_ABI_VERSION = 2
 VERSION = ${ZATHURA_VERSION_MAJOR}.${ZATHURA_VERSION_MINOR}.${ZATHURA_VERSION_REV}
 
-# the GTK+ version to use
-ZATHURA_GTK_VERSION ?= 3
-
 # version checks
 # If you want to disable any of the checks, set *_VERSION_CHECK to 0.
 
 # girara
 GIRARA_VERSION_CHECK ?= 1
 GIRARA_MIN_VERSION = 0.1.8
-GIRARA_PKG_CONFIG_NAME = girara-gtk$(ZATHURA_GTK_VERSION)
+GIRARA_PKG_CONFIG_NAME = girara-gtk3
 # glib
 GLIB_VERSION_CHECK ?= 1
 GLIB_MIN_VERSION = 2.28
 GLIB_PKG_CONFIG_NAME = glib-2.0
 # GTK
 GTK_VERSION_CHECK ?= 1
-GTK_MIN_VERSION = 2.18
-GTK_PKG_CONFIG_NAME = gtk+-$(ZATHURA_GTK_VERSION).0
+GTK_MIN_VERSION = 3.0
+GTK_PKG_CONFIG_NAME = gtk+-3.0
 
 # database
 # To disable support for the sqlite backend set WITH_SQLITE to 0.
@@ -55,8 +52,8 @@ LOCALEDIR ?= ${PREFIX}/share/locale
 RSTTOMAN ?= /usr/bin/rst2man
 
 # libs
-GTK_INC ?= $(shell pkg-config --cflags gtk+-${ZATHURA_GTK_VERSION}.0)
-GTK_LIB ?= $(shell pkg-config --libs gtk+-${ZATHURA_GTK_VERSION}.0)
+GTK_INC ?= $(shell pkg-config --cflags gtk+-3.0)
+GTK_LIB ?= $(shell pkg-config --libs gtk+-3.0)
 
 GTHREAD_INC ?= $(shell pkg-config --cflags gthread-2.0)
 GTHREAD_LIB ?= $(shell pkg-config --libs   gthread-2.0)
@@ -67,8 +64,8 @@ GMODULE_LIB ?= $(shell pkg-config --libs   gmodule-no-export-2.0)
 GLIB_INC ?= $(shell pkg-config --cflags glib-2.0)
 GLIB_LIB ?= $(shell pkg-config --libs glib-2.0)
 
-GIRARA_INC ?= $(shell pkg-config --cflags girara-gtk${ZATHURA_GTK_VERSION})
-GIRARA_LIB ?= $(shell pkg-config --libs girara-gtk${ZATHURA_GTK_VERSION})
+GIRARA_INC ?= $(shell pkg-config --cflags girara-gtk3)
+GIRARA_LIB ?= $(shell pkg-config --libs girara-gtk3)
 
 ifneq (${WITH_SQLITE},0)
 SQLITE_INC ?= $(shell pkg-config --cflags sqlite3)