X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=Makefile;h=751d5af278db75781edef8ddb4321d6a37213b23;hb=bb52b40c8ed5b3c938f6bb157b08bcb18bb067c2;hp=7dfc5b423a3c7b0d21cbe4f4ba808671ec633768;hpb=b7bf1dd7220f73b0d27e94e69099d14064b14661;p=i3%2Fi3status

diff --git a/Makefile b/Makefile
index 7dfc5b4..751d5af 100644
--- a/Makefile
+++ b/Makefile
@@ -3,6 +3,9 @@ CFLAGS+=-g
 CFLAGS+=-std=gnu99
 CFLAGS+=-pedantic
 CFLAGS+=-DPREFIX=\"\"
+CFLAGS+=-I.
+
+VERSION=$(shell git describe --tags --abbrev=0)
 
 ifeq ($(shell uname),Linux)
 CFLAGS+=-DLINUX
@@ -10,12 +13,23 @@ 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)
+
+src/%.o: src/%.c
+	@$(CC) $(CFLAGS) -c -o $@ $<
+	@echo " CC $<"
+
+%.o: %.c %.h
+	@$(CC) $(CFLAGS) -c -o $@ $<
+	@echo " CC $<"
 
-i3status: i3status.o i3status.h
+i3status: src/general.o src/config.o src/get_load.o src/output.o src/get_cpu_temperature.o src/process_runs.o src/get_eth_info.o src/get_ip_addr.o src/get_wireless_info.o src/get_battery_info.o src/get_ipv6_addr.o i3status.o
+	@$(CC) $(LDFLAGS) -o $@ src/*.o *.o
+	@echo " LD $@"
 
 clean:
-	rm -f *.o
+	rm -f *.o src/*.o
 
 distclean: clean
 	rm -f i3status
@@ -29,6 +43,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