Merge branch 'master' into next

[i3/i3] / common.mk

diff --git a/common.mk b/common.mk
index ff12bdb0071f0285c708475633ba4f351de45831..62eb99586e4ddbb9d799b3009319fac5f7b711ec 100644 (file)
--- a/common.mk
+++ b/common.mk
@@ -2,11 +2,15 @@ UNAME=$(shell uname)
 DEBUG=1
 COVERAGE=0
 INSTALL=install
-PREFIX=/usr
-ifeq ($(PREFIX),/usr)
-SYSCONFDIR=/etc
-else
-SYSCONFDIR=$(PREFIX)/etc
+ifndef PREFIX
+  PREFIX=/usr
+endif
+ifndef SYSCONFDIR
+  ifeq ($(PREFIX),/usr)
+    SYSCONFDIR=/etc
+  else
+    SYSCONFDIR=$(PREFIX)/etc
+  endif
 endif
 TERM_EMU=xterm
 # The escaping is absurd, but we need to escape for shell, sed, make, define
@@ -31,7 +35,7 @@ CFLAGS += -Wunused-value
 CFLAGS += -Iinclude
 CFLAGS += $(call cflags_for_lib, xcb-keysyms)
 ifeq ($(shell pkg-config --exists xcb-util || echo 1),1)
-CFLAGS += -DXCB_COMPAT
+CPPFLAGS += -DXCB_COMPAT
 CFLAGS += $(call cflags_for_lib, xcb-atom)
 CFLAGS += $(call cflags_for_lib, xcb-aux)
 else
@@ -45,27 +49,35 @@ CFLAGS += $(call cflags_for_lib, xcursor)
 CFLAGS += $(call cflags_for_lib, x11)
 CFLAGS += $(call cflags_for_lib, yajl)
 CFLAGS += $(call cflags_for_lib, libev)
-CFLAGS += -DI3_VERSION=\"${GIT_VERSION}\"
-CFLAGS += -DSYSCONFDIR=\"${SYSCONFDIR}\"
-CFLAGS += -DTERM_EMU=\"$(TERM_EMU)\"
+CFLAGS += $(call cflags_for_lib, libpcre)
+CPPFLAGS += -DI3_VERSION=\"${GIT_VERSION}\"
+CPPFLAGS += -DSYSCONFDIR=\"${SYSCONFDIR}\"
+CPPFLAGS += -DTERM_EMU=\"$(TERM_EMU)\"
 
-LDFLAGS += -lm
-LDFLAGS += $(call ldflags_for_lib, xcb-event, xcb-event)
-LDFLAGS += $(call ldflags_for_lib, xcb-keysyms, xcb-keysyms)
+LIBS += -lm
+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)
-LDFLAGS += $(call ldflags_for_lib, xcb-atom, xcb-atom)
-LDFLAGS += $(call ldflags_for_lib, xcb-aux, xcb-aux)
+LIBS += $(call ldflags_for_lib, xcb-atom, xcb-atom)
+LIBS += $(call ldflags_for_lib, xcb-aux, xcb-aux)
 else
-LDFLAGS += $(call ldflags_for_lib, xcb-util)
+LIBS += $(call ldflags_for_lib, xcb-util)
+endif
+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)
+LIBS += $(call ldflags_for_lib, yajl, yajl)
+LIBS += $(call ldflags_for_lib, libev, ev)
+LIBS += $(call ldflags_for_lib, libpcre, pcre)
+
+# Please test if -Wl,--as-needed works on your platform and send me a patch.
+# it is known not to work on Darwin (Mac OS X)
+ifneq (,$(filter Linux GNU GNU/%, $(UNAME)))
+LDFLAGS += -Wl,--as-needed
 endif
-LDFLAGS += $(call ldflags_for_lib, xcb-icccm, xcb-icccm)
-LDFLAGS += $(call ldflags_for_lib, xcb-xinerama, xcb-xinerama)
-LDFLAGS += $(call ldflags_for_lib, xcb-randr, xcb-randr)
-LDFLAGS += $(call ldflags_for_lib, xcb, xcb)
-LDFLAGS += $(call ldflags_for_lib, xcursor, Xcursor)
-LDFLAGS += $(call ldflags_for_lib, x11, X11)
-LDFLAGS += $(call ldflags_for_lib, yajl, yajl)
-LDFLAGS += $(call ldflags_for_lib, libev, ev)
 
 ifeq ($(UNAME),NetBSD)
 # We need -idirafter instead of -I to prefer the system’s iconv over GNU libiconv
@@ -75,20 +87,24 @@ endif
 
 ifeq ($(UNAME),OpenBSD)
 CFLAGS += -I${X11BASE}/include
-LDFLAGS += -liconv
+LIBS += -liconv
 LDFLAGS += -L${X11BASE}/lib
 endif
 
 ifeq ($(UNAME),FreeBSD)
-LDFLAGS += -liconv
+LIBS += -liconv
+endif
+
+ifeq ($(UNAME),Darwin)
+LIBS += -liconv
 endif
 
 # 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.
-CFLAGS += -idirafter yajl-fallback
+CFLAGS += -idirafter $(TOPDIR)/yajl-fallback
 
 ifneq (,$(filter Linux GNU GNU/%, $(UNAME)))
-CFLAGS += -D_GNU_SOURCE
+CPPFLAGS += -D_GNU_SOURCE
 endif
 
 ifeq ($(DEBUG),1)
@@ -102,7 +118,7 @@ endif
 
 ifeq ($(COVERAGE),1)
 CFLAGS += -fprofile-arcs -ftest-coverage
-LDFLAGS += -lgcov
+LIBS += -lgcov
 endif
 
 # Don’t print command lines which are run