makefile: fix linking

[i3/i3status] / Makefile

diff --git a/Makefile b/Makefile
index 7dfc5b423a3c7b0d21cbe4f4ba808671ec633768..92e9cbaad921b0387547150440db5a597124e94a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,15 +4,21 @@ 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 i3status to spit out dzen2-compatible output on stdout
-CFLAGS+=-DDZEN
+#CFLAGS+=-DDZEN
+CFLAGS+=$(EXTRA_CFLAGS)
+
+%.o: %.c %.h
+       $(CC) $(CFLAGS) -c -o $@ $<
 
-i3status: i3status.o i3status.h
+i3status: i3status.o
 
 clean:
        rm -f *.o
@@ -29,6 +35,10 @@ install:
        install -m 644 i3status.1 $(DESTDIR)/usr/share/man/man1
 
 release:
-       tar cjf i3status.tar.bz2 *.c *.h *.1 *.conf 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: i3status