bugfix: really return focus list in IPC tree dump (instead of nodes list)

[i3/i3] / common.mk

diff --git a/common.mk b/common.mk
index 3b88b6fe4da29b30eb5b655dd90b2a8e1c0bcb9d..6887470f1f6b63dee89b063680410f4a7c52f916 100644 (file)
--- a/common.mk
+++ b/common.mk
@@ -1,33 +1,25 @@
 UNAME=$(shell uname)
 DEBUG=1
 INSTALL=install
+PREFIX=/usr
+ifeq ($(PREFIX),/usr)
+SYSCONFDIR=/etc
+else
+SYSCONFDIR=$(PREFIX)/etc
+endif
 GIT_VERSION:="$(shell git describe --tags --always) ($(shell git log --pretty=format:%cd --date=short -n1))"
 VERSION:=$(shell git describe --tags --abbrev=0)
 
 CFLAGS += -std=c99
 CFLAGS += -pipe
 CFLAGS += -Wall
-CFLAGS += -Wunused
+# unused-function, unused-label, unused-variable are turned on by -Wall
+# We don’t want unused-parameter because of the use of many callbacks
+CFLAGS += -Wunused-value
 CFLAGS += -Iinclude
 CFLAGS += -I/usr/local/include
 CFLAGS += -DI3_VERSION=\"${GIT_VERSION}\"
 
-# Check if pkg-config is installed, because without pkg-config, the following
-# check for the version of libxcb cannot be done.
-ifeq ($(shell which pkg-config 2>/dev/null 1>/dev/null || echo 1),1)
-$(error "pkg-config was not found")
-endif
-
-ifeq ($(shell pkg-config --exists xcb-keysyms || echo 1),1)
-$(error "pkg-config could not find xcb-keysyms.pc")
-endif
-
-ifeq ($(shell pkg-config --exact-version=0.3.3 xcb-keysyms && echo 1),1)
-# xcb-keysyms fixed API from 0.3.3 to 0.3.4, so for some months, we will
-# have this here. Distributions should upgrade their libxcb in the meantime.
-CFLAGS += -DOLD_XCB_KEYSYMS_API
-endif
-
 LDFLAGS += -lm
 LDFLAGS += -lxcb-event
 LDFLAGS += -lxcb-property
@@ -35,8 +27,10 @@ LDFLAGS += -lxcb-keysyms
 LDFLAGS += -lxcb-atom
 LDFLAGS += -lxcb-aux
 LDFLAGS += -lxcb-icccm
+LDFLAGS += -lxcb-xinerama
 LDFLAGS += -lxcb-randr
 LDFLAGS += -lxcb
+LDFLAGS += -lyajl
 LDFLAGS += -lX11
 LDFLAGS += -lev
 LDFLAGS += -L/usr/local/lib -L/usr/pkg/lib
@@ -48,7 +42,6 @@ LDFLAGS += -Wl,-rpath,/usr/local/lib -Wl,-rpath,/usr/pkg/lib
 endif
 
 ifeq ($(UNAME),OpenBSD)
-CFLAGS += -ftrampolines
 CFLAGS += -I${X11BASE}/include
 LDFLAGS += -liconv
 LDFLAGS += -L${X11BASE}/lib
@@ -68,6 +61,7 @@ CFLAGS += -gdwarf-2
 CFLAGS += -g3
 else
 CFLAGS += -O2
+CFLAGS += -freorder-blocks-and-partition
 endif
 
 # Don’t print command lines which are run