X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=Makefile;h=d62db5d0166a0170e7d40612ea89d573440ad29a;hb=d242ae17454cb49f693227436e40703753d5749a;hp=b6f6b89ecb1d43ed02cffe50a0ced08bef1b24d5;hpb=8910a138ff44fdf818c291fc020e471e750ca762;p=i3%2Fi3

diff --git a/Makefile b/Makefile
index b6f6b89e..d62db5d0 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ TOPDIR=$(shell pwd)
 
 include $(TOPDIR)/common.mk
 
-SUBDIRS:=i3bar i3-dump-log
+SUBDIRS:=
 
 ALL_TARGETS =
 INSTALL_TARGETS =
@@ -17,63 +17,53 @@ 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
 
-real-all: $(ALL_TARGETS) subdirs
+# 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
 
-subdirs:
-	for dir in $(SUBDIRS); do \
-		echo ""; \
-		echo "MAKE $$dir"; \
-		$(MAKE) -C $$dir; \
-	done
+real-all: $(ALL_TARGETS)
 
 install: $(INSTALL_TARGETS)
-	for dir in $(SUBDIRS); do \
-		$(MAKE) -C $$dir install; \
-	done
+
+store_git_version:
+	echo -n ${I3_VERSION} > I3_VERSION
+	echo -n ${VERSION} > VERSION
 
 dist: distclean
 	[ ! -d i3-${VERSION} ] || rm -rf i3-${VERSION}
 	[ ! -e i3-${VERSION}.tar.bz2 ] || rm i3-${VERSION}.tar.bz2
 	mkdir i3-${VERSION}
-	cp i3-migrate-config-to-v4 generate-command-parser.pl i3-sensible-* i3.config.keycodes DEPENDS LICENSE PACKAGE-MAINTAINER RELEASE-NOTES-${VERSION} i3.config i3.xsession.desktop i3.applications.desktop pseudo-doc.doxygen Makefile i3-${VERSION}
-	cp -r src libi3 i3-msg i3-nagbar i3-config-wizard i3bar i3-dump-log yajl-fallback include man parser-specs 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) -C i3bar/doc
+	$(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:=$(shell /bin/echo '${GIT_VERSION}' | sed 's/\\/\\\\/g')/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
+	cp VERSION i3-${VERSION}/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/
-	cp i3bar/doc/*.1 i3-${VERSION}/i3bar/doc/
 	tar cfj i3-${VERSION}.tar.bz2 i3-${VERSION}
 	rm -rf i3-${VERSION}
 
 clean: $(CLEAN_TARGETS)
 	(which lcov >/dev/null 2>&1 && lcov -d . --zerocounters) || true
-	$(MAKE) -C docs clean
-	$(MAKE) -C man clean
-	for dir in $(SUBDIRS); do \
-		echo ""; \
-		echo "CLEAN $$dir"; \
-		$(MAKE) TOPDIR=$(TOPDIR) -C $$dir distclean; \
-	done
 
 distclean: clean $(DISTCLEAN_TARGETS)
-	rm -f i3
-	for dir in $(SUBDIRS); do \
-		echo ""; \
-		echo "DISTCLEAN $$dir"; \
-		$(MAKE) TOPDIR=$(TOPDIR) -C $$dir distclean; \
-	done
 
 coverage:
 	rm -f /tmp/i3-coverage.info