summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorMichael Stapelberg <michael@stapelberg.de>2012-10-26 20:24:55 +0200
committerMichael Stapelberg <michael@stapelberg.de>2012-10-26 20:39:59 +0200
commite1d86a327945111b99148650dc536c9ad8598cc1 (patch)
treef120f2e29e47cfa7eb494f811c3282449cf3d720 /Makefile
parent1d08065fe02304f078c9b34250148777f3d0a734 (diff)
use libxkbcommon for input handling
Thanks to Ran Benita and Daniel Stone (the libxkbcommon authors) for answering my questions and reviewing this code. With this commit, input handling should be more correct with using less code (in i3lock, that is).
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile9
1 files changed, 4 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index a917d6c..c82328e 100644
--- a/Makefile
+++ b/Makefile
@@ -11,17 +11,16 @@ 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 xcb-keysyms xcb-dpms xcb-xinerama)
-LIBS += $(shell pkg-config --libs cairo xcb-keysyms xcb-dpms xcb-xinerama xcb-image)
+CFLAGS += $(shell pkg-config --cflags cairo)
+LIBS += $(shell pkg-config --libs cairo)
else
CPPFLAGS += -DNOLIBCAIRO
-CFLAGS += $(shell pkg-config --cflags xcb-keysyms xcb-dpms xcb-xinerama)
-LIBS += $(shell pkg-config --libs xcb-keysyms xcb-dpms xcb-image xcb-xinerama)
endif
LIBS += -lpam
LIBS += -lev
-LIBS += -lX11
FILES:=$(wildcard *.c)
FILES:=$(FILES:.c=.o)