From 857820719e00f0c0b0a591eeb1ec600a389fe98d Mon Sep 17 00:00:00 2001 From: Andrea Bolognani Date: Sun, 3 Jul 2016 19:32:38 +0200 Subject: [PATCH] linux: Use pkg-config for dependencies' CPPFLAGS and LDLIBS Instead of hardcoding the information needed to compile and link against libraries, call pkg-config to retrieve them at runtime. --- linux/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/linux/Makefile b/linux/Makefile index d7b6917..7ad592b 100644 --- a/linux/Makefile +++ b/linux/Makefile @@ -16,10 +16,10 @@ ifneq ("${BUILDVERSION}", "") MAINT_CPPFLAGS += -DSPECTRWM_BUILDSTR=\"$(BUILDVERSION)\" endif -BIN_CPPFLAGS = -I/usr/include/freetype2 -BIN_LDLIBS = -lX11 -lX11-xcb -lxcb -lxcb-icccm -lxcb-randr -lxcb-keysyms -lxcb-util -lxcb-xtest -lXft -lXcursor -LIB_CPPFLAGS = -LIB_LDLIBS = -lX11 -ldl +BIN_CPPFLAGS = $(shell pkg-config --cflags x11 x11-xcb xcb-icccm xcb-keysyms xcb-randr xcb-util xcb-xtest xcursor xft) +BIN_LDLIBS = $(shell pkg-config --libs x11 x11-xcb xcb-icccm xcb-keysyms xcb-randr xcb-util xcb-xtest xcursor xft) +LIB_CPPFLAGS = $(shell pkg-config --cflags x11) +LIB_LDLIBS = $(shell pkg-config --libs x11) -ldl all: spectrwm libswmhack.so.$(LIBVERSION) -- 2.39.2