From: Quentin Glidic Date: Wed, 16 May 2012 14:22:57 +0000 (+0200) Subject: Move i3-nagbar to the new Makefile layout X-Git-Tag: 4.3~183 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=8910a138ff44fdf818c291fc020e471e750ca762;p=i3%2Fi3 Move i3-nagbar to the new Makefile layout --- diff --git a/Makefile b/Makefile index cb1bb77c..b6f6b89e 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ TOPDIR=$(shell pwd) include $(TOPDIR)/common.mk -SUBDIRS:=i3-nagbar i3bar i3-dump-log +SUBDIRS:=i3bar i3-dump-log ALL_TARGETS = INSTALL_TARGETS = @@ -16,6 +16,7 @@ include src/i3.mk 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 real-all: $(ALL_TARGETS) subdirs diff --git a/i3-nagbar/i3-nagbar.mk b/i3-nagbar/i3-nagbar.mk new file mode 100644 index 00000000..9677b808 --- /dev/null +++ b/i3-nagbar/i3-nagbar.mk @@ -0,0 +1,26 @@ +ALL_TARGETS += i3-nagbar/i3-nagbar +INSTALL_TARGETS += install-i3-nagbar +CLEAN_TARGETS += clean-i3-nagbar + +i3_nagbar_SOURCES := $(wildcard i3-nagbar/*.c) +i3_nagbar_HEADERS := $(wildcard i3-nagbar/*.h) + +i3_nagbar_OBJECTS := $(i3_nagbar_SOURCES:.c=.o) + + +i3-nagbar/%.o: i3-nagbar/%.c $(i3_nagbar_HEADERS) + echo "[i3-nagbar] CC $<" + $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $< + +i3-nagbar/i3-nagbar: libi3.a $(i3_nagbar_OBJECTS) + echo "[i3-nagbar] Link i3-nagbar" + $(CC) $(LDFLAGS) -o $@ $(filter-out libi3.a,$^) $(LIBS) + +install-i3-nagbar: i3-nagbar/i3-nagbar + echo "[i3-nagbar] Install" + $(INSTALL) -d -m 0755 $(DESTDIR)$(PREFIX)/bin + $(INSTALL) -m 0755 i3-nagbar/i3-nagbar $(DESTDIR)$(PREFIX)/bin/ + +clean-i3-nagbar: + echo "[i3-nagbar] Clean" + rm -f $(i3_nagbar_OBJECTS) i3-nagbar/i3-nagbar