X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=Makefile;h=b69c08bb8db6fa09e037120bd95d9542654a5ec5;hb=a6d1da6d5a998725cdcf83133c37ea924ad10c3f;hp=00abff12158ea8b24ba9b51353e3dd2818c24b23;hpb=1ff4d5a8ce8b52a05f4a4eff8c440d316265ee65;p=i3%2Fi3status

diff --git a/Makefile b/Makefile
index 00abff1..b69c08b 100644
--- a/Makefile
+++ b/Makefile
@@ -3,32 +3,66 @@ CFLAGS+=-g
 CFLAGS+=-std=gnu99
 CFLAGS+=-pedantic
 CFLAGS+=-DPREFIX=\"\"
+CFLAGS+=-I.
+LDFLAGS+=-lconfuse
+
+VERSION=$(shell git describe --tags --abbrev=0)
 
 ifeq ($(shell uname),Linux)
 CFLAGS+=-DLINUX
+CFLAGS+=-D_GNU_SOURCE
+LDFLAGS+=-liw
+endif
+
+ifeq ($(shell uname),GNU/kFreeBSD)
+CFLAGS+=-lbsd
 endif
 
 # Define this if you want i3status to spit out dzen2-compatible output on stdout
-CFLAGS+=-DDZEN
+#CFLAGS+=-DDZEN
+CFLAGS+=$(EXTRA_CFLAGS)
+
+OBJS:=$(wildcard src/*.c *.c)
+OBJS:=$(OBJS:.c=.o)
+
+src/%.o: src/%.c
+	@$(CC) $(CFLAGS) -c -o $@ $<
+	@echo " CC $<"
 
-i3status: i3status.o i3status.h
+%.o: %.c %.h
+	@$(CC) $(CFLAGS) -c -o $@ $<
+	@echo " CC $<"
+
+all: i3status manpage
+
+i3status: ${OBJS}
+	@$(CC) -o $@ src/*.o *.o $(LDFLAGS)
+	@echo " LD $@"
 
 clean:
-	rm -f *.o
+	rm -f *.o src/*.o
 
 distclean: clean
 	rm -f i3status
 
+manpage:
+	make -C man
+
 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 i3status $(DESTDIR)/usr/bin/i3status
-	install -m 755 i3status.init $(DESTDIR)/etc/init.d/i3status
 	install -m 644 i3status.conf $(DESTDIR)/etc/i3status.conf
-	install -m 644 i3status.1 $(DESTDIR)/usr/share/man/man1
+	install -m 644 man/i3status.1 $(DESTDIR)/usr/share/man/man1
 
 release:
-	tar cjf i3status.tar.bz2 *.c *.h *.1 *.conf *.init Makefile
-
-all: i3status
+	[ -f i3status-${VERSION} ] || rm -rf i3status-${VERSION}
+	mkdir i3status-${VERSION}
+	find . -maxdepth 1 -type f \( -regex ".*\.\(c\|conf\|h\)" -or -name "Makefile" -or -name "LICENSE" \) -exec cp '{}' i3status-${VERSION} \;
+	mkdir i3status-${VERSION}/src
+	mkdir i3status-${VERSION}/man
+	find src -maxdepth 1 -type f \( -regex ".*\.\(c\|h\)" \) -exec cp '{}' i3status-${VERSION}/src \;
+	find man -maxdepth 1 -type f \( -regex ".*\.\(1\)" \) -exec cp '{}' i3status-${VERSION}/man \;
+	tar cjf i3status-${VERSION}.tar.bz2 i3status-${VERSION}
+	rm -rf i3status-${VERSION}