Merge branch 'master' into next

[i3/i3] / i3-config-wizard / Makefile

diff --git a/i3-config-wizard/Makefile b/i3-config-wizard/Makefile
index 43c3a1ff4c1fe55933f044dac2701810e98ad85a..75d4684f8bcd56f919a3957f54b23646ed398706 100644 (file)
--- a/i3-config-wizard/Makefile
+++ b/i3-config-wizard/Makefile
@@ -8,30 +8,35 @@ AUTOGENERATED:=cfgparse.tab.c cfgparse.yy.c
 FILES:=$(patsubst %.c,%.o,$(filter-out $(AUTOGENERATED),$(wildcard *.c)))
 HEADERS:=$(wildcard *.h)
 
+CPPFLAGS += -I$(TOPDIR)/include
+
 # Depend on the specific file (.c for each .o) and on all headers
 %.o: %.c ${HEADERS}
-       echo "CC $<"
+       echo "[i3-config-wizard] CC $<"
        $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
 
 all: i3-config-wizard
 
-i3-config-wizard: cfgparse.y.o cfgparse.yy.o ${FILES}
-       echo "LINK i3-config-wizard"
-       $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
+i3-config-wizard: $(TOPDIR)/libi3/libi3.a cfgparse.y.o cfgparse.yy.o ${FILES}
+       echo "[i3-config-wizard] LINK i3-config-wizard"
+       $(CC) $(LDFLAGS) -o $@ $(filter-out libi3/libi3.a,$^) $(LIBS)
+
+$(TOPDIR)/libi3/%.a: $(TOPDIR)/libi3/*.c
+       $(MAKE) -C $(TOPDIR)/libi3
 
 cfgparse.yy.o: cfgparse.l cfgparse.y.o ${HEADERS}
-       echo "LEX $<"
-       flex -i -o$(@:.o=.c) $<
+       echo "[i3-config-wizard] LEX $<"
+       $(FLEX) -i -o$(@:.o=.c) $<
        $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $(@:.o=.c)
 
 cfgparse.y.o: cfgparse.y ${HEADERS}
-       echo "YACC $<"
-       bison --debug --verbose -b $(basename $< .y) -d $<
+       echo "[i3-config-wizard] YACC $<"
+       $(BISON) --debug --verbose -b $(basename $< .y) -d $<
        $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $(<:.y=.tab.c)
 
 
 install: all
-       echo "INSTALL"
+       echo "[i3-config-wizard] INSTALL"
        $(INSTALL) -d -m 0755 $(DESTDIR)$(PREFIX)/bin
        $(INSTALL) -m 0755 i3-config-wizard $(DESTDIR)$(PREFIX)/bin/