Merge branch 'next'

[i3/i3] / i3-nagbar / Makefile

diff --git a/i3-nagbar/Makefile b/i3-nagbar/Makefile
index 933ae76cd89fa0a458f766dd11b0bb4fc2dc7db5..05a5b911c3f40224d13c33f61012b6f8fa0638ee 100644 (file)
--- a/i3-nagbar/Makefile
+++ b/i3-nagbar/Makefile
@@ -3,23 +3,28 @@ TOPDIR=..
 
 include $(TOPDIR)/common.mk
 
+CPPFLAGS += -I$(TOPDIR)/include
+
 # Depend on the object files of all source-files in src/*.c and on all header files
 FILES=$(patsubst %.c,%.o,$(wildcard *.c))
 HEADERS=$(wildcard *.h)
 
 # Depend on the specific file (.c for each .o) and on all headers
 %.o: %.c ${HEADERS}
-       echo "CC $<"
+       echo "[i3-nagbar] CC $<"
        $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
 
 all: i3-nagbar
 
-i3-nagbar: ${FILES}
-       echo "LINK i3-nagbar"
-       $(CC) $(LDFLAGS) -o $@ ${FILES} $(LIBS)
+i3-nagbar: $(TOPDIR)/libi3/libi3.a ${FILES}
+       echo "[i3-nagbar] LINK i3-nagbar"
+       $(CC) $(LDFLAGS) -o $@ $(filter-out libi3/libi3.a,$^) $(LIBS)
+
+$(TOPDIR)/libi3/%.a: $(TOPDIR)/libi3/*.c
+       $(MAKE) -C $(TOPDIR)/libi3
 
 install: all
-       echo "INSTALL"
+       echo "[i3-nagbar] INSTALL"
        $(INSTALL) -d -m 0755 $(DESTDIR)$(PREFIX)/bin
        $(INSTALL) -m 0755 i3-nagbar $(DESTDIR)$(PREFIX)/bin/