X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=Makefile;h=c08f2777f61cfa46d48efa3d9b995671c04dc89f;hb=d48c9b1e337a3eb663c6f0f8af28c3b52f405ab4;hp=9e615d6d8ed9163d8fcef6f3aa7c7b94fc3c7503;hpb=139c451e8476ed75ba291d08a22285f203645968;p=i3%2Fi3

diff --git a/Makefile b/Makefile
index 9e615d6d..c08f2777 100644
--- a/Makefile
+++ b/Makefile
@@ -2,102 +2,69 @@ TOPDIR=$(shell pwd)
 
 include $(TOPDIR)/common.mk
 
-# 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
-FILES:=$(filter-out $(AUTOGENERATED),$(wildcard src/*.c))
-FILES:=$(FILES:.c=.o)
-HEADERS:=$(filter-out include/loglevels.h,$(wildcard include/*.h))
+SUBDIRS:=
 
-# 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
+ALL_TARGETS =
+INSTALL_TARGETS =
+CLEAN_TARGETS =
+DISTCLEAN_TARGETS =
 
-# Depend on the specific file (.c for each .o) and on all headers
-src/%.o: src/%.c ${HEADERS}
-	echo "CC $<"
-	$(CC) $(CFLAGS) -DLOGLEVEL="(1 << $(shell awk '/$(shell basename $< .c)/ { print NR }' loglevels.tmp))" -c -o $@ $<
+all: real-all
 
-all: src/cfgparse.y.o src/cfgparse.yy.o ${FILES}
-	echo "LINK i3"
-	$(CC) -o i3 ${FILES} src/cfgparse.y.o src/cfgparse.yy.o $(LDFLAGS)
-	echo ""
-	echo "SUBDIR i3-msg"
-	$(MAKE) TOPDIR=$(TOPDIR) -C i3-msg
-	echo "SUBDIR i3-input"
-	$(MAKE) TOPDIR=$(TOPDIR) -C i3-input
+include libi3/libi3.mk
+include src/i3.mk
+include i3-config-wizard/i3-config-wizard.mk
+include i3-msg/i3-msg.mk
+include i3-input/i3-input.mk
+include i3-nagbar/i3-nagbar.mk
+include i3bar/i3bar.mk
+include i3-dump-log/i3-dump-log.mk
+include docs/docs.mk
+include man/man.mk
 
-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;
+# Update $(TOPDIR)/LAST_VERSION if it differs from $I3_VERSION
+CACHED_VERSION := '$(shell [ -f $(TOPDIR)/LAST_VERSION ] && cat $(TOPDIR)/LAST_VERSION)'
+ifneq ($(CACHED_VERSION),$(I3_VERSION))
+$(shell echo -n ${I3_VERSION} > $(TOPDIR)/LAST_VERSION)
+endif
 
-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)
+real-all: $(ALL_TARGETS)
 
-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)
+install: $(INSTALL_TARGETS)
 
-install: all
-	echo "INSTALL"
-	$(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/
-	$(INSTALL) -m 0755 i3-wsbar $(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
+store_git_version:
+	echo -n ${I3_VERSION} > I3_VERSION
 
 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 i3.welcome i3-wsbar pseudo-doc.doxygen Makefile i3-${VERSION}
-	cp -r src i3-msg include man i3-${VERSION}
+	cp i3-migrate-config-to-v4 i3-save-tree generate-command-parser.pl i3-sensible-* i3-dmenu-desktop i3.config.keycodes DEPENDS LICENSE PACKAGE-MAINTAINER RELEASE-NOTES-${VERSION} i3.config i3.xsession.desktop i3-with-shmlog.xsession.desktop i3.applications.desktop pseudo-doc.doxygen common.mk Makefile i3-${VERSION}
+	cp -r src libi3 i3-msg i3-nagbar i3-config-wizard i3bar i3-dump-log include man parser-specs testcases i3-${VERSION}
 	# Only copy toplevel documentation (important stuff)
 	mkdir i3-${VERSION}/docs
 	# Pre-generate documentation
-	make -C docs
+	$(MAKE) docs
+	# 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=${GIT_VERSION}/g;s/^VERSION:=\(.*\)/VERSION=${VERSION}/g' common.mk > i3-${VERSION}/common.mk
+	find i3-input -maxdepth 1 -type f \( -name "*.c" -or -name "*.mk" -or -name "*.h" -or -name "Makefile" \) -exec cp '{}' i3-${VERSION}/i3-input \;
+	cp I3_VERSION i3-${VERSION}/I3_VERSION
 	# Pre-generate a manpage to allow distributors to skip this step and save some dependencies
-	make -C man
+	$(MAKE) mans
 	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.{output,dot} src/cfgparse.yy.c 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
+clean: $(CLEAN_TARGETS)
+	(which lcov >/dev/null 2>&1 && lcov -d . --zerocounters) || true
+
+distclean: clean $(DISTCLEAN_TARGETS)
 
-distclean: clean
-	rm -f i3
-	$(MAKE) TOPDIR=$(TOPDIR) -C i3-msg distclean
-	$(MAKE) TOPDIR=$(TOPDIR) -C i3-input distclean
+coverage:
+	rm -f /tmp/i3-coverage.info
+	rm -rf /tmp/i3-coverage
+	lcov -d . -b . --capture -o /tmp/i3-coverage.info
+	genhtml -o /tmp/i3-coverage/ /tmp/i3-coverage.info