Breaks configfiles! Major refactoring of i3status, see below

[i3/i3status] / Makefile

diff --git a/Makefile b/Makefile
index 7101da344672af1ce6e8c5e4c6ed25eee1f995d0..2e9f93a053bbeb46b6caca79e936ad5b5d8a475f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,25 +4,38 @@ 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+=$(EXTRA_CFLAGS)
 
-src/%.o: src/%.c src/%.h
-       $(CC) $(CFLAGS) -c -o $@ $<
+OBJS:=$(wildcard src/*.c *.c)
+OBJS:=$(OBJS:.c=.o)
+
+src/%.o: src/%.c
+       @$(CC) $(CFLAGS) -c -o $@ $<
+       @echo " CC $<"
 
 %.o: %.c %.h
-       $(CC) $(CFLAGS) -c -o $@ $<
+       @$(CC) $(CFLAGS) -c -o $@ $<
+       @echo " CC $<"
 
-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
+i3status: ${OBJS}
+       @$(CC) -o $@ src/*.o *.o $(LDFLAGS)
+       @echo " LD $@"
 
 clean:
        rm -f *.o src/*.o