From fba88476dd346be871b932c3f7626dba21de2e95 Mon Sep 17 00:00:00 2001 From: Michael Stapelberg Date: Fri, 26 Oct 2012 20:42:26 +0200 Subject: remove support for NOLIBCAIRO, cairo-xcb is widespread by now --- Makefile | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index c82328e..c910e52 100644 --- a/Makefile +++ b/Makefile @@ -11,14 +11,8 @@ CFLAGS += -std=c99 CFLAGS += -pipe CFLAGS += -Wall CPPFLAGS += -D_GNU_SOURCE -CFLAGS += $(shell pkg-config --cflags xcb-dpms xcb-xinerama xkbcommon xkbfile x11 x11-xcb) -LIBS += $(shell pkg-config --libs xcb-dpms xcb-xinerama xcb-image xkbcommon xkbfile x11 x11-xcb) -ifndef NOLIBCAIRO -CFLAGS += $(shell pkg-config --cflags cairo) -LIBS += $(shell pkg-config --libs cairo) -else -CPPFLAGS += -DNOLIBCAIRO -endif +CFLAGS += $(shell pkg-config --cflags cairo xcb-dpms xcb-xinerama xkbcommon xkbfile x11 x11-xcb) +LIBS += $(shell pkg-config --libs cairo xcb-dpms xcb-xinerama xcb-image xkbcommon xkbfile x11 x11-xcb) LIBS += -lpam LIBS += -lev -- cgit v1.1