add testcase for commit 87525ad

[i3/i3] / Makefile

diff --git a/Makefile b/Makefile
index 419dc561ab355215cfe297f486ff4b107af3529a..3b6750344b9eff42cf6f5f73e0274d773b2f74a1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,55 +2,61 @@ TOPDIR=$(shell pwd)
 
 include $(TOPDIR)/common.mk
 
-# 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 $@ $<
-
-all: ${FILES}
-       echo "LINK i3"
-       $(CC) -o i3 ${FILES} $(LDFLAGS)
-       echo ""
-       echo "SUBDIR i3-msg"
-       $(MAKE) TOPDIR=$(TOPDIR) -C i3-msg
-
-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/
-       $(MAKE) TOPDIR=$(TOPDIR) -C i3-msg install
+SUBDIRS:=
+
+ALL_TARGETS =
+INSTALL_TARGETS =
+CLEAN_TARGETS =
+DISTCLEAN_TARGETS =
+
+all: real-all
+
+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
+
+real-all: $(ALL_TARGETS)
+
+install: $(INSTALL_TARGETS)
 
 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 include man 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 common.mk Makefile i3-${VERSION}
+       cp -r src libi3 i3-msg i3-nagbar i3-config-wizard i3bar i3-dump-log yajl-fallback include man parser-specs testcases 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
+       # Pre-generate documentation
+       $(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 "*.mk" -or -name "*.h" -or -name "Makefile" \) -exec cp '{}' i3-${VERSION}/i3-input \;
+       echo -n ${I3_VERSION} > i3-${VERSION}/I3_VERSION
+       echo -n ${VERSION} > i3-${VERSION}/VERSION
        # 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
+       $(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
-       $(MAKE) -C docs clean
-       $(MAKE) -C man clean
-       $(MAKE) TOPDIR=$(TOPDIR) -C i3-msg 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
+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