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

diff --git a/Makefile b/Makefile
index ab25d4e..d91eaf7 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ INSTALL=install
 PREFIX=/usr
 SYSCONFDIR=/etc
 
-# Check if pkg-config is installed, we need it for building CFLAGS/LDFLAGS
+# 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
@@ -10,30 +10,26 @@ 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-dpms xcb-xinerama xcb-atom xcb-image xcb-xkb xkbcommon xkbcommon-x11)
+LIBS += $(shell pkg-config --libs cairo xcb-dpms 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}\"
+CPPFLAGS += -DVERSION=\"${GIT_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 +42,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 CHANGELOG i3lock-${VERSION}
+	sed -e 's/^GIT_VERSION:=\(.*\)/GIT_VERSION:=$(shell /bin/echo '${GIT_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}