X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=Makefile;h=b3d4dc2735c652ca875f22a987d5ef4bf548b259;hb=5aff9594aa1805af793fc670c350ae7b2cd35dfb;hp=ab25d4e55a201b30fa6711cbb1d58268392d775c;hpb=fc6b72eaece88b0cd3d4e1e35392843911d00748;p=i3%2Fi3lock

diff --git a/Makefile b/Makefile
index ab25d4e..b3d4dc2 100644
--- a/Makefile
+++ b/Makefile
@@ -1,39 +1,44 @@
+TOPDIR=$(shell pwd)
+
 INSTALL=install
 PREFIX=/usr
 SYSCONFDIR=/etc
+PKG_CONFIG=pkg-config
 
-# Check if pkg-config is installed, we need it for building CFLAGS/LDFLAGS
-ifeq ($(shell which pkg-config 2>/dev/null 1>/dev/null || echo 1),1)
-$(error "pkg-config was not found")
+# Check if pkg-config is installed, we need it for building CFLAGS/LIBS
+ifeq ($(shell which $(PKG_CONFIG) 2>/dev/null 1>/dev/null || echo 1),1)
+$(error "$(PKG_CONFIG) was not found")
 endif
 
 CFLAGS += -std=c99
 CFLAGS += -pipe
 CFLAGS += -Wall
-CFLAGS += -D_GNU_SOURCE
-ifndef NOLIBCAIRO
-CFLAGS += $(shell pkg-config --cflags cairo xcb-keysyms xcb-dpms)
-LDFLAGS += $(shell pkg-config --libs cairo xcb-keysyms xcb-dpms xcb-image)
-else
-CFLAGS += -DNOLIBCAIRO
-CFLAGS += $(shell pkg-config --cflags xcb-keysyms xcb-dpms)
-LDFLAGS += $(shell pkg-config --libs xcb-keysyms xcb-dpms xcb-image)
-endif
-LDFLAGS += -lpam
+CPPFLAGS += -D_GNU_SOURCE
+CFLAGS += $(shell $(PKG_CONFIG) --cflags cairo xcb-composite xcb-xinerama xcb-atom xcb-image xcb-xkb xkbcommon xkbcommon-x11)
+LIBS += $(shell $(PKG_CONFIG) --libs cairo xcb-composite xcb-xinerama xcb-atom xcb-image xcb-xkb xkbcommon xkbcommon-x11)
+LIBS += -lpam
+LIBS += -lev
+LIBS += -lm
 
 FILES:=$(wildcard *.c)
 FILES:=$(FILES:.c=.o)
 
-VERSION:=$(shell git describe --tags --abbrev=0)
-GIT_VERSION:="$(shell git describe --tags --always) ($(shell git log --pretty=format:%cd --date=short -n1))"
-CFLAGS += -DVERSION=\"${GIT_VERSION}\"
+ifeq ($(wildcard .git),)
+  # not in git repository
+  VERSION := $(shell [ -f $(TOPDIR)/I3LOCK_VERSION ] && cat $(TOPDIR)/I3LOCK_VERSION | cut -d '-' -f 1)
+  I3LOCK_VERSION := '$(shell [ -f $(TOPDIR)/I3LOCK_VERSION ] && cat $(TOPDIR)/I3LOCK_VERSION)'
+else
+  VERSION:=$(shell git describe --tags --abbrev=0)
+  I3LOCK_VERSION:="$(shell git describe --tags --always) ($(shell git log --pretty=format:%cd --date=short -n1))"
+endif
+CPPFLAGS += -DVERSION=\"${I3LOCK_VERSION}\"
 
 .PHONY: install clean uninstall
 
 all: i3lock
 
 i3lock: ${FILES}
-	$(CC) -o $@ $^ $(LDFLAGS)
+	$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
 
 clean:
 	rm -f i3lock ${FILES} i3lock-${VERSION}.tar.gz
@@ -46,3 +51,12 @@ install: all
 
 uninstall:
 	rm -f $(DESTDIR)$(PREFIX)/bin/i3lock
+
+dist: clean
+	[ ! -d i3lock-${VERSION} ] || rm -rf i3lock-${VERSION}
+	[ ! -e i3lock-${VERSION}.tar.bz2 ] || rm i3lock-${VERSION}.tar.bz2
+	mkdir i3lock-${VERSION}
+	cp *.c *.h i3lock.1 i3lock.pam Makefile LICENSE README.md CHANGELOG i3lock-${VERSION}
+	sed -e 's/^I3LOCK_VERSION:=\(.*\)/I3LOCK_VERSION:=$(shell /bin/echo '${I3LOCK_VERSION}' | sed 's/\\/\\\\/g')/g;s/^VERSION:=\(.*\)/VERSION:=${VERSION}/g' Makefile > i3lock-${VERSION}/Makefile
+	tar cfj i3lock-${VERSION}.tar.bz2 i3lock-${VERSION}
+	rm -rf i3lock-${VERSION}