Fix linking (Thanks Atsutane)

[i3/i3status] / Makefile

diff --git a/Makefile b/Makefile
index 92e9cbaad921b0387547150440db5a597124e94a..bcbb73d30f8e2213684447c70ef81956a934351a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,25 +3,38 @@ CFLAGS+=-g
 CFLAGS+=-std=gnu99
 CFLAGS+=-pedantic
 CFLAGS+=-DPREFIX=\"\"
+CFLAGS+=-I.
 
 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
+       @$(CC) $(CFLAGS) -c -o $@ $<
+       @echo " CC $<"
+
 %.o: %.c %.h
-       $(CC) $(CFLAGS) -c -o $@ $<
+       @$(CC) $(CFLAGS) -c -o $@ $<
+       @echo " CC $<"
 
-i3status: i3status.o
+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) -o $@ src/*.o *.o $(LDFLAGS)
+       @echo " LD $@"
 
 clean:
-       rm -f *.o
+       rm -f *.o src/*.o
 
 distclean: clean
        rm -f i3status