From bbede0ba00dc6e8b1e50233d00167defc0f4b8de Mon Sep 17 00:00:00 2001 From: Quentin Glidic Date: Wed, 16 May 2012 16:22:57 +0200 Subject: [PATCH] Move i3-msg to the new Makefile layout --- Makefile | 3 ++- i3-msg/i3-msg.mk | 26 ++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 i3-msg/i3-msg.mk diff --git a/Makefile b/Makefile index 3f434427..5ed79c35 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ TOPDIR=$(shell pwd) include $(TOPDIR)/common.mk -SUBDIRS:=i3-msg i3-input i3-nagbar i3bar i3-dump-log +SUBDIRS:=i3-input i3-nagbar i3bar i3-dump-log ALL_TARGETS = INSTALL_TARGETS = @@ -14,6 +14,7 @@ all: real-all include libi3/libi3.mk include src/i3.mk include i3-config-wizard/i3-config-wizard.mk +include i3-msg/i3-msg.mk real-all: $(ALL_TARGETS) subdirs diff --git a/i3-msg/i3-msg.mk b/i3-msg/i3-msg.mk new file mode 100644 index 00000000..9526dc04 --- /dev/null +++ b/i3-msg/i3-msg.mk @@ -0,0 +1,26 @@ +ALL_TARGETS += i3-msg/i3-msg +INSTALL_TARGETS += install-i3-msg +CLEAN_TARGETS += clean-i3-msg + +i3_msg_SOURCES := $(wildcard i3-msg/*.c) +i3_msg_HEADERS := $(wildcard i3-msg/*.h) + +i3_msg_OBJECTS := $(i3_msg_SOURCES:.c=.o) + + +i3-msg/%.o: i3-msg/%.c $(i3_msg_HEADERS) + echo "[i3-msg] CC $<" + $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $< + +i3-msg/i3-msg: libi3.a $(i3_msg_OBJECTS) + echo "[i3-msg] Link i3-msg" + $(CC) $(LDFLAGS) -o $@ $(filter-out libi3.a,$^) $(LIBS) + +install-i3-msg: i3-msg/i3-msg + echo "[i3-msg] Install" + $(INSTALL) -d -m 0755 $(DESTDIR)$(PREFIX)/bin + $(INSTALL) -m 0755 i3-msg/i3-msg $(DESTDIR)$(PREFIX)/bin/ + +clean-i3-msg: + echo "[i3-msg] Clean" + rm -f $(i3_msg_OBJECTS) i3-msg/i3-msg -- 2.39.5