makefile: fix release target

[i3/i3status] / Makefile

diff --git a/Makefile b/Makefile
index 90e1ce3dd44377e1a0b0591a8e908fd9a36455fd..8d7eeb9f68bcccd38ffead83e2353d4f9fbe90ee 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,32 +1,41 @@
 CFLAGS+=-Wall -Wshadow -Wpointer-arith -Wcast-qual -Wsign-compare
 CFLAGS+=-g
+CFLAGS+=-std=gnu99
+CFLAGS+=-pedantic
 CFLAGS+=-DPREFIX=\"\"
 
+VERSION=$(shell git describe --tags --abbrev=0)
+
 ifeq ($(shell uname),Linux)
 CFLAGS+=-DLINUX
+CFLAGS+=-D_GNU_SOURCE
 endif
 
-# Define this if you want wmiistatus to spit out dzen2-compatible output on stdout
+# Define this if you want i3status to spit out dzen2-compatible output on stdout
 #CFLAGS+=-DDZEN
+CFLAGS+=$(EXTRA_CFLAGS)
 
-wmiistatus: wmiistatus.o wmiistatus.h
+i3status: i3status.o i3status.h
 
 clean:
        rm -f *.o
 
 distclean: clean
-       rm -f wmiistatus
+       rm -f i3status
 
 install:
        install -m 755 -d $(DESTDIR)/usr/bin
-       install -m 755 -d $(DESTDIR)/etc/init.d
+       install -m 755 -d $(DESTDIR)/etc
        install -m 755 -d $(DESTDIR)/usr/share/man/man1
-       install -m 755 wmiistatus $(DESTDIR)/usr/bin/wmiistatus
-       install -m 755 wmiistatus.init $(DESTDIR)/etc/init.d/wmiistatus
-       install -m 644 wmiistatus.conf $(DESTDIR)/etc/wmiistatus.conf
-       install -m 644 wmiistatus.1 $(DESTDIR)/usr/share/man/man1
+       install -m 755 i3status $(DESTDIR)/usr/bin/i3status
+       install -m 644 i3status.conf $(DESTDIR)/etc/i3status.conf
+       install -m 644 i3status.1 $(DESTDIR)/usr/share/man/man1
 
 release:
-       tar cjf wmiistatus.tar.bz2 *.c *.h *.1 *.conf *.init Makefile
+       [ -f i3status-${VERSION} ] || rm -rf i3status-${VERSION}
+       mkdir i3status-${VERSION}
+       find . -maxdepth 1 -type f \( -regex ".*\.\(c\|conf\|1\|h\)" -or -name "Makefile" \) -exec cp '{}' i3status-${VERSION} \;
+       tar cjf i3status-${VERSION}.tar.bz2 i3status-${VERSION}
+       rm -rf i3status-${VERSION}
 
-all: wmiistatus
+all: i3status