Remove pointer warp from test boilerplate

[i3/i3] / common.mk

diff --git a/common.mk b/common.mk
index bb5cf79346b3b9b06265ad7716f81b263b967b43..23ac8e34f0efb59492647f1fda2b745f55ce7304 100644 (file)
--- a/common.mk
+++ b/common.mk
@@ -2,8 +2,6 @@ UNAME=$(shell uname)
 DEBUG=1
 COVERAGE=0
 INSTALL=install
-FLEX=flex
-BISON=bison
 ifndef PREFIX
   PREFIX=/usr
 endif
@@ -111,8 +109,8 @@ X11_CFLAGS := $(call cflags_for_lib, x11)
 X11_LIBS   := $(call ldflags_for_lib, x11,X11)
 
 # Xcursor
-XCURSOR_CFLAGS := $(call cflags_for_lib, xcursor)
-XCURSOR_LIBS   := $(call ldflags_for_lib, xcursor,Xcursor)
+XCURSOR_CFLAGS := $(call cflags_for_lib, xcb-cursor)
+XCURSOR_LIBS   := $(call ldflags_for_lib, xcb-cursor,xcb-cursor)
 
 # yajl
 YAJL_CFLAGS := $(call cflags_for_lib, yajl)
@@ -144,7 +142,7 @@ PANGO_LIBS   := $(call ldflags_for_lib, cairo)
 PANGO_LIBS   += $(call ldflags_for_lib, pangocairo)
 
 # libi3
-LIBS = -L$(TOPDIR) -li3
+LIBS = -L$(TOPDIR) -li3 -lm
 
 ## Platform-specific flags
 
@@ -195,6 +193,7 @@ ifeq ($(V),0)
 # echo-ing vars
 V_ASCIIDOC = echo ASCIIDOC $@;
 V_POD2HTML = echo POD2HTML $@;
+V_POD2MAN = echo POD2MAN $@;
 V_A2X = echo A2X $@;
 endif