Merge branch 'master' into next

[i3/i3] / common.mk

diff --git a/common.mk b/common.mk
index b8ceea3bfc65475a72f9152db1c5c09e72999576..53094fb33040bbc86901a4b94041e074958d067b 100644 (file)
--- a/common.mk
+++ b/common.mk
@@ -58,6 +58,7 @@ CPPFLAGS += -DPCRE_HAS_UCP=1
 endif
 
 LIBS += -lm
+LIBS += -L $(TOPDIR)/libi3 -li3
 LIBS += $(call ldflags_for_lib, xcb-event, xcb-event)
 LIBS += $(call ldflags_for_lib, xcb-keysyms, xcb-keysyms)
 ifeq ($(shell pkg-config --exists xcb-util || echo 1),1)