X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=i3-config-wizard%2FMakefile;h=75d4684f8bcd56f919a3957f54b23646ed398706;hb=efa1cada293d356d3c14913d3a0225c3012bb611;hp=4471576653ba92b849d8e2ee9c1c383a1cd1f461;hpb=2491a155ee9ddc6dc52c0d9904c05e67facb2bea;p=i3%2Fi3

diff --git a/i3-config-wizard/Makefile b/i3-config-wizard/Makefile
index 44715766..75d4684f 100644
--- a/i3-config-wizard/Makefile
+++ b/i3-config-wizard/Makefile
@@ -4,36 +4,44 @@ TOPDIR=..
 include $(TOPDIR)/common.mk
 
 # Depend on the object files of all source-files in src/*.c and on all header files
-FILES:=$(patsubst %.c,%.o,$(wildcard *.c))
+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 $<"
-	$(CC) $(CFLAGS) -c -o $@ $<
+	echo "[i3-config-wizard] CC $<"
+	$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
+
+all: i3-config-wizard
+
+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)
 
-all: cfgparse.y.o cfgparse.yy.o ${FILES}
-	echo "LINK i3-config-wizard"
-	$(CC) -o i3-config-wizard ${FILES} $(LDFLAGS)
+$(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) $<
-	$(CC) $(CFLAGS) -c -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 $<
-	$(CC) $(CFLAGS) -c -o $@ $(<:.y=.tab.c)
+	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/
 
 clean:
-	rm -f *.o
+	rm -f *.o cfgparse.tab.{c,h} cfgparse.output cfgparse.yy.c
 
 distclean: clean
 	rm -f i3-config-wizard