X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=common.mk;h=b086bc8535ff5f349bebcfb3d0036a69f608aeb5;hb=679a5de8cfb9211afb1a1dd882e53bd672084754;hp=0214abfa52d9e18d956abff02ac851afb5edfc84;hpb=a09a5c391ea3bf350b966b65c6dfd2fcc017c88b;p=i3%2Fi3

diff --git a/common.mk b/common.mk
index 0214abfa..b086bc85 100644
--- a/common.mk
+++ b/common.mk
@@ -2,8 +2,7 @@ UNAME=$(shell uname)
 DEBUG=1
 COVERAGE=0
 INSTALL=install
-FLEX=flex
-BISON=bison
+LN=ln
 ifndef PREFIX
   PREFIX=/usr
 endif
@@ -116,9 +115,6 @@ XCURSOR_LIBS   := $(call ldflags_for_lib, xcb-cursor,xcb-cursor)
 
 # yajl
 YAJL_CFLAGS := $(call cflags_for_lib, yajl)
-# Fallback for libyajl 1 which did not include yajl_version.h. We need
-# YAJL_MAJOR from that file to decide which code path should be used.
-YAJL_CFLAGS += -idirafter $(TOPDIR)/yajl-fallback
 YAJL_LIBS   := $(call ldflags_for_lib, yajl,yajl)
 
 #libev
@@ -144,7 +140,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
 
@@ -172,8 +168,8 @@ endif
 
 ifeq ($(UNAME),Darwin)
 LIBS += -liconv
-else
-# Darwin (Mac OS X) doesn’t have librt
+else ifneq ($(UNAME),OpenBSD)
+# Darwin (Mac OS X) and OpenBSD do not have librt
 LIBS += -lrt
 endif