makefile: fix linking

[i3/i3status] / Makefile

diff --git a/Makefile b/Makefile
index 0b51a6ede834a22544bac3ba264f814a324a49e3..92e9cbaad921b0387547150440db5a597124e94a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -12,9 +12,13 @@ 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)
 
-i3status: i3status.o i3status.h
+%.o: %.c %.h
+       $(CC) $(CFLAGS) -c -o $@ $<
+
+i3status: i3status.o
 
 clean:
        rm -f *.o
@@ -33,7 +37,7 @@ install:
 release:
        [ -f i3status-${VERSION} ] || rm -rf i3status-${VERSION}
        mkdir i3status-${VERSION}
-       cp *.c *.h *.1 *.conf Makefile 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}