Merge branch 'master' into next

[i3/i3] / Makefile

diff --git a/Makefile b/Makefile
index 06063c0117cdbd5e4d9af164467a81ed3ae8a291..bec6b64b3bc923b607394c11013b8e446380c85f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@ else
 UNUSED:=$(shell $(MAKE) loglevels.h)
 endif
 
-SUBDIRS=i3-msg i3-input i3-nagbar i3-config-wizard
+SUBDIRS=i3-msg i3-input i3-nagbar i3-config-wizard i3bar
 
 # Depend on the specific file (.c for each .o) and on all headers
 src/%.o: src/%.c ${HEADERS}
@@ -79,7 +79,10 @@ install: all
        $(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-migrate-config-to-v4.pl $(DESTDIR)$(PREFIX)/bin/
+       $(INSTALL) -m 0755 i3-migrate-config-to-v4 $(DESTDIR)$(PREFIX)/bin/
+       $(INSTALL) -m 0755 i3-sensible-editor $(DESTDIR)$(PREFIX)/bin/
+       $(INSTALL) -m 0755 i3-sensible-pager $(DESTDIR)$(PREFIX)/bin/
+       $(INSTALL) -m 0755 i3-sensible-terminal $(DESTDIR)$(PREFIX)/bin/
        test -e $(DESTDIR)$(SYSCONFDIR)/i3/config || $(INSTALL) -m 0644 i3.config $(DESTDIR)$(SYSCONFDIR)/i3/config
        test -e $(DESTDIR)$(SYSCONFDIR)/i3/config.keycodes || $(INSTALL) -m 0644 i3.config.keycodes $(DESTDIR)$(SYSCONFDIR)/i3/config.keycodes
        $(INSTALL) -m 0644 i3.welcome $(DESTDIR)$(SYSCONFDIR)/i3/welcome
@@ -93,12 +96,13 @@ 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.pl i3.config.keycodes DEPENDS GOALS LICENSE PACKAGE-MAINTAINER TODO RELEASE-NOTES-${VERSION} i3.config i3.desktop i3.welcome pseudo-doc.doxygen i3-wsbar Makefile i3-${VERSION}
-       cp -r src i3-msg i3-nagbar i3-config-wizard yajl-fallback include man i3-${VERSION}
+       cp i3-migrate-config-to-v4 i3.config.keycodes DEPENDS GOALS LICENSE PACKAGE-MAINTAINER TODO RELEASE-NOTES-${VERSION} i3.config i3.desktop i3.welcome pseudo-doc.doxygen i3-wsbar Makefile i3-${VERSION}
+       cp -r src i3-msg i3-nagbar i3-config-wizard i3bar yajl-fallback include man i3-${VERSION}
        # Only copy toplevel documentation (important stuff)
        mkdir i3-${VERSION}/docs
        # Pre-generate documentation
        make -C docs
+       make -C i3bar/doc
        # 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 \;
@@ -109,25 +113,28 @@ dist: distclean
        # Pre-generate a manpage to allow distributors to skip this step and save some dependencies
        $(MAKE) -C man
        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:
        rm -f src/*.o src/*.gcno src/cfgparse.tab.{c,h} src/cfgparse.yy.c src/cfgparse.{output,dot} src/cmdparse.tab.{c,h} src/cmdparse.yy.c src/cmdparse.{output,dot} loglevels.tmp include/loglevels.h
-       (which lcov >/dev/null && lcov -d . --zerocounters) || true
+       (which lcov >/dev/null 2>&1 && lcov -d . --zerocounters) || true
        $(MAKE) -C docs clean
        $(MAKE) -C man clean
-       $(MAKE) TOPDIR=$(TOPDIR) -C i3-msg clean
-       $(MAKE) TOPDIR=$(TOPDIR) -C i3-input clean
-       $(MAKE) TOPDIR=$(TOPDIR) -C i3-nagbar clean
-       $(MAKE) TOPDIR=$(TOPDIR) -C i3-config-wizard clean
+       for dir in $(SUBDIRS); do \
+               echo ""; \
+               echo "CLEAN $$dir"; \
+               $(MAKE) TOPDIR=$(TOPDIR) -C $$dir distclean; \
+       done
 
 distclean: clean
        rm -f i3
-       $(MAKE) TOPDIR=$(TOPDIR) -C i3-msg distclean
-       $(MAKE) TOPDIR=$(TOPDIR) -C i3-input distclean
-       $(MAKE) TOPDIR=$(TOPDIR) -C i3-nagbar distclean
-       $(MAKE) TOPDIR=$(TOPDIR) -C i3-config-wizard distclean
+       for dir in $(SUBDIRS); do \
+               echo ""; \
+               echo "DISTCLEAN $$dir"; \
+               $(MAKE) TOPDIR=$(TOPDIR) -C $$dir distclean; \
+       done
 
 coverage:
        rm -f /tmp/i3-coverage.info