Move i3bar to the new Makefile layout

diff --git a/Makefile b/Makefile
index b6f6b89ecb1d43ed02cffe50a0ced08bef1b24d5..f8f7245d9bd2b878d607dec54a290cbac43751db 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ TOPDIR=$(shell pwd)
 
 include $(TOPDIR)/common.mk
 
-SUBDIRS:=i3bar i3-dump-log
+SUBDIRS:=i3-dump-log
 
 ALL_TARGETS =
 INSTALL_TARGETS =
@@ -17,6 +17,7 @@ include i3-config-wizard/i3-config-wizard.mk
 include i3-msg/i3-msg.mk
 include i3-input/i3-input.mk
 include i3-nagbar/i3-nagbar.mk
+include i3bar/i3bar.mk
 
 real-all: $(ALL_TARGETS) subdirs
 

diff --git a/i3bar/i3bar.mk b/i3bar/i3bar.mk
new file mode 100644 (file)
index 0000000..3f16f8a
--- /dev/null
+++ b/i3bar/i3bar.mk
@@ -0,0 +1,26 @@
+ALL_TARGETS += i3bar/i3bar
+INSTALL_TARGETS += install-i3bar
+CLEAN_TARGETS += clean-i3bar
+
+i3bar_SOURCES := $(wildcard i3bar/src/*.c)
+i3bar_HEADERS := $(wildcard i3bar/include/*.h)
+
+i3bar_OBJECTS := $(i3bar_SOURCES:.c=.o)
+
+
+i3bar/src/%.o: i3bar/src/%.c $(i3bar_HEADERS)
+       echo "[i3bar] CC $<"
+       $(CC) $(CPPFLAGS) $(CFLAGS) -Ii3bar/include -c -o $@ $<
+
+i3bar/i3bar: libi3.a $(i3bar_OBJECTS)
+       echo "[i3bar] Link i3bar"
+       $(CC) $(LDFLAGS) -o $@ $(filter-out libi3.a,$^) $(LIBS)
+
+install-i3bar: i3bar/i3bar
+       echo "[i3bar] Install"
+       $(INSTALL) -d -m 0755 $(DESTDIR)$(PREFIX)/bin
+       $(INSTALL) -m 0755 i3bar/i3bar $(DESTDIR)$(PREFIX)/bin/
+
+clean-i3bar:
+       echo "[i3bar] Clean"
+       rm -f $(i3bar_OBJECTS) i3bar/i3bar