From 60bc6b040064484628d253beb0b1abe4e24e403f Mon Sep 17 00:00:00 2001 From: Quentin Glidic Date: Sun, 22 Jul 2012 23:42:18 +0200 Subject: [PATCH] common.mk: Split Xcursor flags --- common.mk | 6 ++++-- src/i3.mk | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/common.mk b/common.mk index a357a7a1..57034b02 100644 --- a/common.mk +++ b/common.mk @@ -75,7 +75,6 @@ CFLAGS += $(call cflags_for_lib, xcb-icccm) CFLAGS += $(call cflags_for_lib, xcb-xinerama) CFLAGS += $(call cflags_for_lib, xcb-randr) CFLAGS += $(call cflags_for_lib, xcb) -CFLAGS += $(call cflags_for_lib, xcursor) CFLAGS += $(call cflags_for_lib, x11) LIBS += -lm @@ -92,9 +91,12 @@ LIBS += $(call ldflags_for_lib, xcb-icccm,xcb-icccm) LIBS += $(call ldflags_for_lib, xcb-xinerama,xcb-xinerama) LIBS += $(call ldflags_for_lib, xcb-randr,xcb-randr) LIBS += $(call ldflags_for_lib, xcb,xcb) -LIBS += $(call ldflags_for_lib, xcursor,Xcursor) LIBS += $(call ldflags_for_lib, x11,X11) +# Xcursor +XCURSOR_CFLAGS := $(call cflags_for_lib, xcursor) +XCURSOR_LIBS := $(call ldflags_for_lib, xcursor,Xcursor) + # yajl YAJL_CFLAGS := $(call cflags_for_lib, yajl) # Fallback for libyajl 1 which did not include yajl_version.h. We need diff --git a/src/i3.mk b/src/i3.mk index e1d781d1..363df0b3 100644 --- a/src/i3.mk +++ b/src/i3.mk @@ -6,8 +6,8 @@ i3_SOURCES_GENERATED = src/cfgparse.tab.c src/cfgparse.yy.c i3_SOURCES := $(filter-out $(i3_SOURCES_GENERATED),$(wildcard src/*.c)) i3_HEADERS_CMDPARSER := $(wildcard include/GENERATED_*.h) i3_HEADERS := $(filter-out $(i3_HEADERS_CMDPARSER),$(wildcard include/*.h)) -i3_CFLAGS = $(YAJL_CFLAGS) $(LIBEV_CFLAGS) $(PCRE_CFLAGS) $(LIBSN_CFLAGS) -i3_LIBS = $(YAJL_LIBS) $(LIBEV_LIBS) $(PCRE_LIBS) $(LIBSN_LIBS) +i3_CFLAGS = $(XCURSOR_CFLAGS) $(YAJL_CFLAGS) $(LIBEV_CFLAGS) $(PCRE_CFLAGS) $(LIBSN_CFLAGS) +i3_LIBS = $(XCURSOR_LIBS) $(YAJL_LIBS) $(LIBEV_LIBS) $(PCRE_LIBS) $(LIBSN_LIBS) i3_OBJECTS := $(i3_SOURCES_GENERATED:.c=.o) $(i3_SOURCES:.c=.o) -- 2.39.5