Merge branch 'master' into next

[i3/i3] / Makefile

diff --git a/Makefile b/Makefile
index 58fd01780d2f3b2f8d18c2ae90fa0423704f0f03..f8ace071fd704dfeb84a653b55818eb5c69b27cb 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -31,7 +31,7 @@ i3: libi3/libi3.a src/cfgparse.y.o src/cfgparse.yy.o src/cmdparse.y.o src/cmdpar
        echo "[i3] LINK i3"
        $(CC) $(LDFLAGS) -o $@ $(filter-out libi3/libi3.a,$^) $(LIBS)
 
-libi3/%.a:
+libi3/%.a: libi3/*.c
        $(MAKE) -C libi3
 
 subdirs:
@@ -55,23 +55,23 @@ loglevels.h:
 
 src/cfgparse.yy.o: src/cfgparse.l src/cfgparse.y.o ${HEADERS}
        echo "[i3] LEX $<"
-       flex -i -o$(@:.o=.c) $<
+       $(FLEX) -i -o$(@:.o=.c) $<
        $(CC) $(CPPFLAGS) $(CFLAGS) -DLOGLEVEL="(1 << $(shell awk '/cfgparse.l/ { print NR }' loglevels.tmp))" -c -o $@ $(@:.o=.c)
 
 src/cmdparse.yy.o: src/cmdparse.l src/cmdparse.y.o ${HEADERS}
        echo "[i3] LEX $<"
-       flex -Pcmdyy -i -o$(@:.o=.c) $<
+       $(FLEX) -Pcmdyy -i -o$(@:.o=.c) $<
        $(CC) $(CPPFLAGS) $(CFLAGS) -DLOGLEVEL="(1 << $(shell awk '/cmdparse.l/ { print NR }' loglevels.tmp))" -c -o $@ $(@:.o=.c)
 
 
 src/cfgparse.y.o: src/cfgparse.y ${HEADERS}
        echo "[i3] YACC $<"
-       bison --debug --verbose -b $(basename $< .y) -d $<
+       $(BISON) --debug --verbose -b $(basename $< .y) -d $<
        $(CC) $(CPPFLAGS) $(CFLAGS) -DLOGLEVEL="(1 << $(shell awk '/cfgparse.y/ { print NR }' loglevels.tmp))" -c -o $@ $(<:.y=.tab.c)
 
 src/cmdparse.y.o: src/cmdparse.y ${HEADERS}
        echo "[i3] YACC $<"
-       bison -p cmdyy --debug --verbose -b $(basename $< .y) -d $<
+       $(BISON) -p cmdyy --debug --verbose -b $(basename $< .y) -d $<
        $(CC) $(CPPFLAGS) $(CFLAGS) -DLOGLEVEL="(1 << $(shell awk '/cmdparse.y/ { print NR }' loglevels.tmp))" -c -o $@ $(<:.y=.tab.c)
 
 
@@ -104,15 +104,15 @@ dist: distclean
        # Only copy toplevel documentation (important stuff)
        mkdir i3-${VERSION}/docs
        # Pre-generate documentation
-       make -C docs
-       make -C i3bar/doc
+       $(MAKE) -C docs
+       $(MAKE) -C i3bar/doc
        # Cleanup τεχ output files
        find docs -regex ".*\.\(aux\|out\|log\|toc\|bm\|dvi\|log\)" -exec rm '{}' \;
        find docs -maxdepth 1 -type f ! \( -name "*.xcf" -or -name "*.svg" \) -exec cp '{}' i3-${VERSION}/docs \;
        # Only copy source code from i3-input
        mkdir i3-${VERSION}/i3-input
        find i3-input -maxdepth 1 -type f \( -name "*.c" -or -name "*.h" -or -name "Makefile" \) -exec cp '{}' i3-${VERSION}/i3-input \;
-       sed -e 's/^GIT_VERSION:=\(.*\)/GIT_VERSION:=$(shell echo '${GIT_VERSION}' | sed 's/\\/\\\\/g')/g;s/^VERSION:=\(.*\)/VERSION:=${VERSION}/g' common.mk > i3-${VERSION}/common.mk
+       sed -e 's/^GIT_VERSION:=\(.*\)/GIT_VERSION:=$(shell /bin/echo '${GIT_VERSION}' | sed 's/\\/\\\\/g')/g;s/^VERSION:=\(.*\)/VERSION:=${VERSION}/g' common.mk > i3-${VERSION}/common.mk
        # Pre-generate a manpage to allow distributors to skip this step and save some dependencies
        $(MAKE) -C man
        cp man/*.1 i3-${VERSION}/man/