Bugfix: Obey colspan/rowspan when checking if containers can be snapped to the right...

[i3/i3] / Makefile

diff --git a/Makefile b/Makefile
index 6a21a7cd086b9a53d4a7f9bac710a663a8f5304b..a42099d47eb01a02f3ee7a250045696789488c55 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,6 @@
 UNAME=$(shell uname)
 DEBUG=1
 INSTALL=install
-MAKE=make
 GIT_VERSION=$(shell git describe --tags --always)
 VERSION=$(shell git describe --tags --abbrev=0)
 
@@ -13,11 +12,32 @@ 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-wm
+LDFLAGS += -lxcb-event
+LDFLAGS += -lxcb-property
 LDFLAGS += -lxcb-keysyms
+LDFLAGS += -lxcb-atom
+LDFLAGS += -lxcb-aux
+LDFLAGS += -lxcb-icccm
 LDFLAGS += -lxcb-xinerama
 LDFLAGS += -lX11
+LDFLAGS += -lev
 LDFLAGS += -L/usr/local/lib -L/usr/pkg/lib
 
 ifeq ($(UNAME),NetBSD)
@@ -65,15 +85,20 @@ install: all
        echo "INSTALL"
        $(INSTALL) -d -m 0755 $(DESTDIR)/usr/bin
        $(INSTALL) -d -m 0755 $(DESTDIR)/etc/i3
+       $(INSTALL) -d -m 0755 $(DESTDIR)/usr/share/xsessions
        $(INSTALL) -m 0755 i3 $(DESTDIR)/usr/bin/
        test -e $(DESTDIR)/etc/i3/config || $(INSTALL) -m 0644 i3.config $(DESTDIR)/etc/i3/config
+       $(INSTALL) -m 0644 i3.desktop $(DESTDIR)/usr/share/xsessions/
 
 dist: clean
-       [ ! -f i3-${VERSION} ] || rm -rf i3-${VERSION}
+       [ ! -d i3-${VERSION} ] || rm -rf i3-${VERSION}
        [ ! -e i3-${VERSION}.tar.bz2 ] || rm i3-${VERSION}.tar.bz2
        mkdir i3-${VERSION}
-       cp DEPENDS GOALS LICENSE PACKAGE-MAINTAINER TODO i3.config i3-${VERSION}
-       cp -r src include docs man i3-${VERSION}
+       cp DEPENDS GOALS LICENSE PACKAGE-MAINTAINER TODO RELEASE-* i3.config i3.desktop pseudo-doc.doxygen i3-${VERSION}
+       cp -r src include man i3-${VERSION}
+       # Only copy toplevel documentation (important stuff)
+       mkdir i3-${VERSION}/docs
+       find docs -maxdepth 1 -type f ! -name "*.xcf" -exec cp '{}' i3-${VERSION}/docs \;
        sed -e 's/^GIT_VERSION=\(.*\)/GIT_VERSION=${GIT_VERSION}/g;s/^VERSION=\(.*\)/VERSION=${VERSION}/g' Makefile > i3-${VERSION}/Makefile
        tar cf i3-${VERSION}.tar i3-${VERSION}
        bzip2 -9 i3-${VERSION}.tar