Use doxygen compatible comments

[i3/i3] / Makefile

diff --git a/Makefile b/Makefile
index e4a04bb57b4e161e336ef919aefdf61effa4e8c6..7245c5c45e767db4f5849aae1219471f3a1d0232 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -6,12 +6,22 @@ include $(TOPDIR)/common.mk
 AUTOGENERATED:=src/cfgparse.tab.c src/cfgparse.yy.c
 FILES:=$(filter-out $(AUTOGENERATED),$(wildcard src/*.c))
 FILES:=$(FILES:.c=.o)
-HEADERS=$(wildcard include/*.h)
+HEADERS:=$(filter-out include/loglevels.h,$(wildcard include/*.h))
+
+# Recursively generate loglevels.h by explicitly calling make
+# We need this step because we need to ensure that loglevels.h will be
+# updated if necessary, but we also want to save rebuilds of the object
+# files, so we cannot let the object files depend on loglevels.h.
+ifeq ($(MAKECMDGOALS),loglevels.h)
+UNUSED:=$(warning Generating loglevels.h)
+else
+UNUSED:=$(shell $(MAKE) loglevels.h)
+endif
 
 # Depend on the specific file (.c for each .o) and on all headers
 src/%.o: src/%.c ${HEADERS}
        echo "CC $<"
-       $(CC) $(CFLAGS) -c -o $@ $<
+       $(CC) $(CFLAGS) -DLOGLEVEL="(1 << $(shell awk '/$(shell basename $< .c)/ { print NR }' loglevels.tmp))" -c -o $@ $<
 
 all: src/cfgparse.y.o src/cfgparse.yy.o ${FILES}
        echo "LINK i3"
@@ -22,15 +32,27 @@ all: src/cfgparse.y.o src/cfgparse.yy.o ${FILES}
        echo "SUBDIR i3-input"
        $(MAKE) TOPDIR=$(TOPDIR) -C i3-input
 
+loglevels.h:
+       echo "LOGLEVELS"
+       for file in $$(ls src/*.c src/*.y src/*.l | grep -v 'cfgparse.\(tab\|yy\).c'); \
+       do \
+               echo $$(basename $$file .c); \
+       done > loglevels.tmp
+       (echo "char *loglevels[] = {"; for file in $$(cat loglevels.tmp); \
+       do \
+               echo "\"$$file\", "; \
+       done; \
+       echo "};") > include/loglevels.h;
+
 src/cfgparse.yy.o: src/cfgparse.l
        echo "LEX $<"
-       lex -i -o $(@:.o=.c) $<
-       $(CC) $(CFLAGS) -c -o $@ $(@:.o=.c)
+       flex -i -o$(@:.o=.c) $<
+       $(CC) $(CFLAGS) -DLOGLEVEL="(1 << $(shell awk '/cfgparse.l/ { print NR }' loglevels.tmp))" -c -o $@ $(@:.o=.c)
 
 src/cfgparse.y.o: src/cfgparse.y
        echo "YACC $<"
-       yacc --debug --verbose -b $(basename $< .y) -d $<
-       $(CC) $(CFLAGS) -c -o $@ $(<:.y=.tab.c)
+       bison --debug --verbose -b $(basename $< .y) -d $<
+       $(CC) $(CFLAGS) -DLOGLEVEL="(1 << $(shell awk '/cfgparse.y/ { print NR }' loglevels.tmp))" -c -o $@ $(<:.y=.tab.c)
 
 install: all
        echo "INSTALL"
@@ -39,6 +61,7 @@ install: all
        $(INSTALL) -d -m 0755 $(DESTDIR)/usr/share/xsessions
        $(INSTALL) -m 0755 i3 $(DESTDIR)/usr/bin/
        test -e $(DESTDIR)/etc/i3/config || $(INSTALL) -m 0644 i3.config $(DESTDIR)/etc/i3/config
+       $(INSTALL) -m 0644 i3.welcome $(DESTDIR)/etc/i3/welcome
        $(INSTALL) -m 0644 i3.desktop $(DESTDIR)/usr/share/xsessions/
        $(MAKE) TOPDIR=$(TOPDIR) -C i3-msg install
        $(MAKE) TOPDIR=$(TOPDIR) -C i3-input install
@@ -47,21 +70,23 @@ dist: distclean
        [ ! -d i3-${VERSION} ] || rm -rf i3-${VERSION}
        [ ! -e i3-${VERSION}.tar.bz2 ] || rm i3-${VERSION}.tar.bz2
        mkdir i3-${VERSION}
-       cp DEPENDS GOALS LICENSE PACKAGE-MAINTAINER TODO RELEASE-NOTES-${VERSION} i3.config i3.desktop pseudo-doc.doxygen Makefile i3-${VERSION}
-       cp -r src i3-msg i3-input include man i3-${VERSION}
+       cp DEPENDS GOALS LICENSE PACKAGE-MAINTAINER TODO RELEASE-NOTES-${VERSION} i3.config i3.desktop i3.welcome pseudo-doc.doxygen Makefile i3-${VERSION}
+       cp -r src i3-msg include man i3-${VERSION}
        # Only copy toplevel documentation (important stuff)
        mkdir i3-${VERSION}/docs
        find docs -maxdepth 1 -type f ! -name "*.xcf" -exec cp '{}' i3-${VERSION}/docs \;
-       sed -e 's/^GIT_VERSION=\(.*\)/GIT_VERSION=${GIT_VERSION}/g;s/^VERSION=\(.*\)/VERSION=${VERSION}/g' common.mk > i3-${VERSION}/common.mk
+       # 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=${GIT_VERSION}/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/i3.1 i3-${VERSION}/man/i3.1
-       tar cf i3-${VERSION}.tar i3-${VERSION}
-       bzip2 -9 i3-${VERSION}.tar
+       cp man/*.1 i3-${VERSION}/man/
+       tar cfj i3-${VERSION}.tar.bz2 i3-${VERSION}
        rm -rf i3-${VERSION}
 
 clean:
-       rm -f src/*.o src/cfgparse.tab.{c,h} src/cfgparse.yy.c
+       rm -f src/*.o src/cfgparse.tab.{c,h} src/cfgparse.yy.c loglevels.tmp include/loglevels.h
        $(MAKE) -C docs clean
        $(MAKE) -C man clean
        $(MAKE) TOPDIR=$(TOPDIR) -C i3-msg clean