Move libi3 to the new Makefile layout

[i3/i3] / Makefile

diff --git a/Makefile b/Makefile
index c121bbdf6116fae412ac077be98e52fc8b0d2239..2ffdffcc5bf282c9bdb25a75c4b5d31a08535c95 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -11,13 +11,11 @@ DISTCLEAN_TARGETS =
 
 all: real-all
 
+include libi3/libi3.mk
 include src/i3.mk
 
 real-all: $(ALL_TARGETS) subdirs
 
-libi3/%.a: libi3/*.c
-       $(MAKE) -C libi3
-
 subdirs:
        for dir in $(SUBDIRS); do \
                echo ""; \
@@ -57,7 +55,6 @@ dist: distclean
 
 clean: $(CLEAN_TARGETS)
        (which lcov >/dev/null 2>&1 && lcov -d . --zerocounters) || true
-       $(MAKE) -C libi3 clean
        $(MAKE) -C docs clean
        $(MAKE) -C man clean
        for dir in $(SUBDIRS); do \