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 b1940140b34381cab3a9d34420f974a6235cf963..6887470f1f6b63dee89b063680410f4a7c52f916 100644 (file)
--- a/common.mk
+++ b/common.mk
@@ -1,6 +1,12 @@
 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)
 
@@ -14,22 +20,6 @@ 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
@@ -71,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