Merge branch 'master' into next

[i3/i3] / common.mk

diff --git a/common.mk b/common.mk
index 0214abfa52d9e18d956abff02ac851afb5edfc84..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
@@ -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