shm-logging: implement i3-dump-log -f (follow)

[i3/i3] / src / i3.mk

diff --git a/src/i3.mk b/src/i3.mk
index e056342d44555c6f792cbec2aff8147c2c977132..8ba04cd295c2ad60eea336f141f57196377f2d91 100644 (file)
--- a/src/i3.mk
+++ b/src/i3.mk
@@ -6,30 +6,52 @@ i3_SOURCES_GENERATED  = src/cfgparse.tab.c src/cfgparse.yy.c
 i3_SOURCES           := $(filter-out $(i3_SOURCES_GENERATED),$(wildcard src/*.c))
 i3_HEADERS_CMDPARSER := $(wildcard include/GENERATED_*.h)
 i3_HEADERS           := $(filter-out $(i3_HEADERS_CMDPARSER),$(wildcard include/*.h))
-i3_CFLAGS             = $(XCB_WM_CFLAGS) $(X11_CFLAGS) $(XCURSOR_CFLAGS) $(YAJL_CFLAGS) $(LIBEV_CFLAGS) $(PCRE_CFLAGS) $(LIBSN_CFLAGS)
-i3_LIBS               = $(XCB_WM_LIBS) $(X11_LIBS) $(XCURSOR_LIBS) $(YAJL_LIBS) $(LIBEV_LIBS) $(PCRE_LIBS) $(LIBSN_LIBS) -lm
+i3_CFLAGS             = $(XCB_CFLAGS) $(XCB_KBD_CFLAGS) $(XCB_WM_CFLAGS) $(X11_CFLAGS) $(XCURSOR_CFLAGS) $(YAJL_CFLAGS) $(LIBEV_CFLAGS) $(PCRE_CFLAGS) $(LIBSN_CFLAGS)
+i3_LIBS               = $(XCB_LIBS) $(XCB_KBD_LIBS) $(XCB_WM_LIBS) $(X11_LIBS) $(XCURSOR_LIBS) $(YAJL_LIBS) $(LIBEV_LIBS) $(PCRE_LIBS) $(LIBSN_LIBS) -lm -lpthread
+
+# When using clang, we use pre-compiled headers to speed up the build. With
+# gcc, this actually makes the build slower.
+ifeq ($(CC),clang)
+i3_HEADERS_DEP       := $(i3_HEADERS) include/all.h.pch
+PCH_FLAGS            := -include include/all.h
+else
+i3_HEADERS_DEP       := $(i3_HEADERS)
+PCH_FLAGS            :=
+endif
 
 i3_OBJECTS := $(i3_SOURCES_GENERATED:.c=.o) $(i3_SOURCES:.c=.o)
 
-src/%.o: src/%.c $(i3_HEADERS)
+# The basename/readlink calls are for canonicalizing the path: Instead
+# of src/main.c, we will see something like ../i3-4.2/src/main.c in
+# debugger backtraces, making it clearer which code belongs to i3 and
+# which code doesn’t.
+# We only do this for src/ since all the other subdirectories contain i3 in
+# their name already.
+canonical_path := ../$(shell basename $(shell readlink -f .))
+
+include/all.h.pch: $(i3_HEADERS)
+       echo "[i3] PCH all.h"
+       $(CC) $(I3_CPPFLAGS) $(CPPFLAGS) $(i3_CFLAGS) $(I3_CFLAGS) $(CFLAGS) -x c-header include/all.h -o include/all.h.pch
+
+src/%.o: src/%.c $(i3_HEADERS_DEP)
        echo "[i3] CC $<"
-       $(CC) $(I3_CPPFLAGS) $(CPPFLAGS) $(i3_CFLAGS) $(I3_CFLAGS) $(CFLAGS) -c -o $@ $<
+       $(CC) $(I3_CPPFLAGS) $(CPPFLAGS) $(i3_CFLAGS) $(I3_CFLAGS) $(CFLAGS) $(PCH_FLAGS) -c -o $@ ${canonical_path}/$<
 
-src/cfgparse.yy.c: src/cfgparse.l src/cfgparse.tab.o $(i3_HEADERS)
+src/cfgparse.yy.c: src/cfgparse.l src/cfgparse.tab.o $(i3_HEADERS_DEP)
        echo "[i3] LEX $<"
-       $(FLEX) -i -o $@ $<
+       $(FLEX) -i -o $@ ${canonical_path}/$<
 
-src/cfgparse.tab.c: src/cfgparse.y $(i3_HEADERS)
+src/cfgparse.tab.c: src/cfgparse.y $(i3_HEADERS_DEP)
        echo "[i3] YACC $<"
-       $(BISON) --debug --verbose -b $(basename $< .y) -d $<
+       $(BISON) --debug --verbose -b $(basename $< .y) -d ${canonical_path}/$<
 
 # This target compiles the command parser twice:
 # Once with -DTEST_PARSER, creating a stand-alone executable used for tests,
 # and once as an object file for i3.
-src/commands_parser.o: src/commands_parser.c $(i3_HEADERS) i3-command-parser.stamp
+src/commands_parser.o: src/commands_parser.c $(i3_HEADERS_DEP) i3-command-parser.stamp
        echo "[i3] CC $<"
        $(CC) $(I3_CPPFLAGS) $(CPPFLAGS) $(i3_CFLAGS) $(I3_CFLAGS) $(CFLAGS) $(I3_LDFLAGS) $(LDFLAGS) -DTEST_PARSER -o test.commands_parser $< $(i3_LIBS) $(LIBS)
-       $(CC) $(I3_CPPFLAGS) $(CPPFLAGS) $(i3_CFLAGS) $(I3_CFLAGS) $(CFLAGS) -c -o $@ $<
+       $(CC) $(I3_CPPFLAGS) $(CPPFLAGS) $(i3_CFLAGS) $(I3_CFLAGS) $(CFLAGS) -c -o $@ ${canonical_path}/$<
 
 i3-command-parser.stamp: generate-command-parser.pl parser-specs/commands.spec
        echo "[i3] Generating command parser"
@@ -60,4 +82,4 @@ install-i3: i3
 
 clean-i3:
        echo "[i3] Clean"
-       rm -f $(i3_OBJECTS) $(i3_SOURCES_GENERATED) $(i3_HEADERS_CMDPARSER) i3-command-parser.stamp i3 src/*.gcno src/cfgparse.{output,dot}
+       rm -f $(i3_OBJECTS) $(i3_SOURCES_GENERATED) $(i3_HEADERS_CMDPARSER) include/loglevels.h loglevels.tmp include/all.h.pch i3-command-parser.stamp i3 src/*.gcno src/cfgparse.{output,dot}