X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=Makefile;h=991fb49fa6b211634e9d5322de1fa095ea137e02;hb=c0563af3e27543d97eb3d201c2e197cc6285cb80;hp=9f82b1a9ffb5815d9ee6dd0756fa3985730d5b6f;hpb=8f844fb9d5384624f8ace03b696b493f051ec6f8;p=i3%2Fi3

diff --git a/Makefile b/Makefile
index 9f82b1a9..991fb49f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,112 +1,107 @@
-UNAME=$(shell uname)
-DEBUG=1
-INSTALL=install
-GIT_VERSION=$(shell git describe --tags --always)
-VERSION=$(shell git describe --tags --abbrev=0)
-
-CFLAGS += -std=c99
-CFLAGS += -pipe
-CFLAGS += -Wall
-CFLAGS += -Wunused
-CFLAGS += -Iinclude
-CFLAGS += -I/usr/local/include
-CFLAGS += -DI3_VERSION=\"${GIT_VERSION}\"
-
-# Check if pkg-config is installed, because without pkg-config, the following
-# check for the version of libxcb cannot be done.
-ifeq ($(shell which pkg-config 2>/dev/null 1>/dev/null || echo 1),1)
-$(error "pkg-config was not found")
-endif
-
-ifeq ($(shell pkg-config --exists xcb-keysyms || echo 1),1)
-$(error "pkg-config could not find xcb-keysyms.pc")
-endif
-
-ifeq ($(shell pkg-config --exact-version=0.3.3 xcb-keysyms && echo 1),1)
-# xcb-keysyms fixed API from 0.3.3 to 0.3.4, so for some months, we will
-# have this here. Distributions should upgrade their libxcb in the meantime.
-CFLAGS += -DOLD_XCB_KEYSYMS_API
-endif
-
-LDFLAGS += -lm
-LDFLAGS += -lxcb-event
-LDFLAGS += -lxcb-property
-LDFLAGS += -lxcb-keysyms
-LDFLAGS += -lxcb-atom
-LDFLAGS += -lxcb-aux
-LDFLAGS += -lxcb-icccm
-LDFLAGS += -lxcb-xinerama
-LDFLAGS += -lX11
-LDFLAGS += -L/usr/local/lib -L/usr/pkg/lib
-
-ifeq ($(UNAME),NetBSD)
-# We need -idirafter instead of -I to prefer the system’s iconv over GNU libiconv
-CFLAGS += -idirafter /usr/pkg/include
-LDFLAGS += -Wl,-rpath,/usr/local/lib -Wl,-rpath,/usr/pkg/lib
-endif
-
-ifeq ($(UNAME),FreeBSD)
-LDFLAGS += -liconv
-endif
+TOPDIR=$(shell pwd)
 
-ifeq ($(UNAME),Linux)
-CFLAGS += -D_GNU_SOURCE
-endif
+include $(TOPDIR)/common.mk
 
-ifeq ($(DEBUG),1)
-# Extended debugging flags, macros shall be available in gcc
-CFLAGS += -gdwarf-2
-CFLAGS += -g3
+# Depend on the object files of all source-files in src/*.c and on all header files
+AUTOGENERATED:=src/cfgparse.tab.c src/cfgparse.yy.c src/cmdparse.tab.c src/cmdparse.yy.c
+FILES:=src/ipc.c src/main.c src/log.c src/util.c src/tree.c src/xcb.c src/manage.c src/workspace.c src/x.c src/floating.c src/click.c src/config.c src/handlers.c src/randr.c src/xinerama.c src/con.c src/load_layout.c src/render.c src/window.c src/match.c src/xcursor.c src/resize.c src/sighandler.c src/move.c src/output.c src/ewmh.c
+FILES:=$(FILES:.c=.o)
+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
-CFLAGS += -O2
+UNUSED:=$(shell $(MAKE) loglevels.h)
 endif
 
-# Don’t print command lines which are run
-.SILENT:
-
-# Always remake the following targets
-.PHONY: install clean dist distclean
-
-# Depend on the object files of all source-files in src/*.c and on all header files
-FILES=$(patsubst %.c,%.o,$(wildcard src/*.c))
-HEADERS=$(wildcard include/*.h)
-
 # 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="((uint64_t)1 << $(shell awk '/$(shell basename $< .c)/ { print NR; exit 0; }' loglevels.tmp))" -c -o $@ $<
 
-all: ${FILES}
+all: src/cfgparse.y.o src/cfgparse.yy.o src/cmdparse.y.o src/cmdparse.yy.o ${FILES}
 	echo "LINK i3"
-	$(CC) -o i3 ${FILES} $(LDFLAGS)
+	$(CC) -o i3 $^ $(LDFLAGS)
+
+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 src/cfgparse.y.o ${HEADERS}
+	echo "LEX $<"
+	flex -i -o$(@:.o=.c) $<
+	$(CC) $(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 "LEX $<"
+	flex -Pcmdyy -i -o$(@:.o=.c) $<
+	$(CC) $(CFLAGS) -DLOGLEVEL="(1 << $(shell awk '/cmdparse.l/ { print NR }' loglevels.tmp))" -c -o $@ $(@:.o=.c)
+
+
+src/cfgparse.y.o: src/cfgparse.y ${HEADERS}
+	echo "YACC $<"
+	bison --debug --verbose -b $(basename $< .y) -d $<
+	$(CC) $(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 "YACC $<"
+	bison -p cmdyy --debug --verbose -b $(basename $< .y) -d $<
+	$(CC) $(CFLAGS) -DLOGLEVEL="(1 << $(shell awk '/cmdparse.y/ { print NR }' loglevels.tmp))" -c -o $@ $(<:.y=.tab.c)
+
 
 install: all
 	echo "INSTALL"
-	$(INSTALL) -d -m 0755 $(DESTDIR)/usr/bin
-	$(INSTALL) -d -m 0755 $(DESTDIR)/etc/i3
-	$(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.desktop $(DESTDIR)/usr/share/xsessions/
-
-dist: clean
+	$(INSTALL) -d -m 0755 $(DESTDIR)$(PREFIX)/bin
+	$(INSTALL) -d -m 0755 $(DESTDIR)$(SYSCONFDIR)/i3
+	$(INSTALL) -d -m 0755 $(DESTDIR)$(PREFIX)/include/i3
+	$(INSTALL) -d -m 0755 $(DESTDIR)$(PREFIX)/share/xsessions
+	$(INSTALL) -m 0755 i3 $(DESTDIR)$(PREFIX)/bin/
+	test -e $(DESTDIR)$(SYSCONFDIR)/i3/config || $(INSTALL) -m 0644 i3.config $(DESTDIR)$(SYSCONFDIR)/i3/config
+	$(INSTALL) -m 0644 i3.welcome $(DESTDIR)$(SYSCONFDIR)/i3/welcome
+	$(INSTALL) -m 0644 i3.desktop $(DESTDIR)$(PREFIX)/share/xsessions/
+	$(INSTALL) -m 0644 include/i3/ipc.h $(DESTDIR)$(PREFIX)/include/i3/
+	$(MAKE) TOPDIR=$(TOPDIR) -C i3-msg install
+	$(MAKE) TOPDIR=$(TOPDIR) -C i3-input install
+
+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-* i3.config i3.desktop pseudo-doc.doxygen i3-${VERSION}
-	cp -r src 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' Makefile > i3-${VERSION}/Makefile
-	tar cf i3-${VERSION}.tar i3-${VERSION}
-	bzip2 -9 i3-${VERSION}.tar
+	# 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
+	# Pre-generate a manpage to allow distributors to skip this step and save some dependencies
+	make -C man
+	cp man/*.1 i3-${VERSION}/man/
+	tar cfj i3-${VERSION}.tar.bz2 i3-${VERSION}
 	rm -rf i3-${VERSION}
 
 clean:
-	rm -f src/*.o
+	rm -f src/*.o src/cfgparse.tab.{c,h} src/cfgparse.yy.c src/cfgparse.output src/cmdparse.tab.{c,h} src/cmdparse.yy.c src/cmdparse.output loglevels.tmp include/loglevels.h
 	$(MAKE) -C docs clean
 	$(MAKE) -C man clean
+	$(MAKE) TOPDIR=$(TOPDIR) -C i3-msg clean
+	$(MAKE) TOPDIR=$(TOPDIR) -C i3-input clean
 
 distclean: clean
 	rm -f i3
+	$(MAKE) TOPDIR=$(TOPDIR) -C i3-msg distclean
+	$(MAKE) TOPDIR=$(TOPDIR) -C i3-input distclean