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