From 1a1eb0f3f2fec380abdb55dcc8ec2bdcc1bca6cc Mon Sep 17 00:00:00 2001
From: Quentin Glidic <sardemff7+git@sardemff7.net>
Date: Wed, 16 May 2012 16:22:57 +0200
Subject: [PATCH] Move i3bar to the new Makefile layout

---
 Makefile       |  3 ++-
 i3bar/i3bar.mk | 26 ++++++++++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 i3bar/i3bar.mk

diff --git a/Makefile b/Makefile
index b6f6b89e..f8f7245d 100644
--- 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
index 00000000..3f16f8a2
--- /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
-- 
2.39.2