Move libi3 to the new Makefile layout

[i3/i3] / i3bar / Makefile

diff --git a/i3bar/Makefile b/i3bar/Makefile
index 216e68cce443cffcd54bf58e20a5e83a6ef17afd..79d0e7cd4e0e58f43d97bb1db4064503a5785ad9 100644 (file)
--- a/i3bar/Makefile
+++ b/i3bar/Makefile
@@ -1,4 +1,4 @@
-TOPDIR=$(shell pwd)
+TOPDIR=..
 
 include $(TOPDIR)/common.mk
 
@@ -6,32 +6,37 @@ FILES:=$(wildcard src/*.c)
 FILES:=$(FILES:.c=.o)
 HEADERS:=$(wildcard include/*.h)
 
+CPPFLAGS += -I$(TOPDIR)/include
+
 all: i3bar doc
 
-i3bar: ${FILES}
-       echo "LINK"
-       $(CC) -o i3bar ${FILES} ${LDFLAGS}
+i3bar: $(TOPDIR)/libi3/libi3.a ${FILES}
+       echo "[i3bar] LINK"
+       $(CC) $(LDFLAGS) -o $@ $(filter-out libi3/libi3.a,$^) $(LIBS)
+
+$(TOPDIR)/libi3/%.a: $(TOPDIR)/libi3/*.c
+       $(MAKE) -C $(TOPDIR)/libi3
 
 doc:
        echo ""
-       echo "SUBDIR doc"
+       echo "[i3bar] SUBDIR doc"
        $(MAKE) -C doc
 
 src/%.o: src/%.c ${HEADERS}
-       echo "CC $<"
+       echo "[i3bar] CC $<"
        $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
 
 install: all
-       echo "INSTALL"
+       echo "[i3bar] INSTALL"
        $(INSTALL) -d -m 0755 $(DESTDIR)$(PREFIX)/bin
        $(INSTALL) -m 0755 i3bar $(DESTDIR)$(PREFIX)/bin
 
 clean:
        rm -f src/*.o
-       make -C doc clean
+       $(MAKE) -C doc clean
 
 distclean: clean
        rm -f i3bar
-       make -C doc distclean
+       $(MAKE) -C doc distclean
 
 .PHONY: install clean distclean doc