X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=Makefile;h=92e9cbaad921b0387547150440db5a597124e94a;hb=refs%2Ftags%2F1.1;hp=1b4313c872a81d8587da2e93b59a976606b3920b;hpb=bbd9e7f85d2ac1d88ccb7e847c534abae36bc46a;p=i3%2Fi3status

diff --git a/Makefile b/Makefile
index 1b4313c..92e9cba 100644
--- a/Makefile
+++ b/Makefile
@@ -1,29 +1,44 @@
 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
 
-wmiistatus: wmiistatus.o wmiistatus.h
+# Define this if you want i3status to spit out dzen2-compatible output on stdout
+#CFLAGS+=-DDZEN
+CFLAGS+=$(EXTRA_CFLAGS)
+
+%.o: %.c %.h
+	$(CC) $(CFLAGS) -c -o $@ $<
+
+i3status: i3status.o
 
 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