X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=i3-msg%2Fi3-msg.mk;h=277c43e7b788407013dccf69f408330e802cc1e4;hb=bc52fae15c75635e9cec57e25619d304dba3a69b;hp=cdd44987604a7155da9c71943701ddf5b9a2196f;hpb=3b1b72ecbbd6031be8aa41283aeeb4d936e5cb44;p=i3%2Fi3 diff --git a/i3-msg/i3-msg.mk b/i3-msg/i3-msg.mk index cdd44987..277c43e7 100644 --- a/i3-msg/i3-msg.mk +++ b/i3-msg/i3-msg.mk @@ -4,24 +4,24 @@ CLEAN_TARGETS += clean-i3-msg i3_msg_SOURCES := $(wildcard i3-msg/*.c) i3_msg_HEADERS := $(wildcard i3-msg/*.h) -i3_msg_CFLAGS = -i3_msg_LIBS = +i3_msg_CFLAGS = $(XCB_CFLAGS) $(PANGO_CFLAGS) $(YAJL_CFLAGS) +i3_msg_LIBS = $(XCB_LIBS) $(YAJL_LIBS) i3_msg_OBJECTS := $(i3_msg_SOURCES:.c=.o) i3-msg/%.o: i3-msg/%.c $(i3_msg_HEADERS) echo "[i3-msg] CC $<" - $(CC) $(CPPFLAGS) $(i3_msg_CFLAGS) $(CFLAGS) -c -o $@ $< + $(CC) $(I3_CPPFLAGS) $(XCB_CPPFLAGS) $(CPPFLAGS) $(i3_msg_CFLAGS) $(I3_CFLAGS) $(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,$^) $(i3_msg_LIBS) $(LIBS) + $(CC) $(I3_LDFLAGS) $(LDFLAGS) -o $@ $(filter-out libi3.a,$^) $(LIBS) $(i3_msg_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/ + $(INSTALL) -d -m 0755 $(DESTDIR)$(EXEC_PREFIX)/bin + $(INSTALL) -m 0755 i3-msg/i3-msg $(DESTDIR)$(EXEC_PREFIX)/bin/ clean-i3-msg: echo "[i3-msg] Clean"