Move libi3 to the new Makefile layout

libi3/Makefile

@@ -1,26 +0,0 @@
-# Default value so one can compile i3-msg standalone
-TOPDIR=..
-
-include $(TOPDIR)/common.mk
-
-CFLAGS += -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 "[libi3] CC $<"
-	$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
-
-all: libi3.a
-
-libi3.a: ${FILES}
-	echo "[libi3] AR libi3.a"
-	ar rcs libi3.a ${FILES}
-
-clean:
-	rm -f *.o libi3.a
-
-distclean: clean

libi3/libi3.mk

@@ -0,0 +1,19 @@
+CLEAN_TARGETS += clean-libi3
+
+libi3_SOURCES := $(wildcard libi3/*.c)
+libi3_HEADERS := $(wildcard libi3/*.h)
+
+libi3_OBJECTS := $(libi3_SOURCES:.c=.o)
+
+
+libi3/%.o: libi3/%.c $(libi3_HEADERS)
+	echo "[libi3] CC $<"
+	$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
+
+libi3.a: $(libi3_OBJECTS)
+	echo "[libi3] AR libi3.a"
+	ar rcs $@ $^
+
+clean-libi3:
+	echo "[libi3] Clean"
+	rm -f $(libi3_OBJECTS) libi3.a