Merge branch 'master' into next

This commit is contained in:
Michael Stapelberg 2012-06-10 18:25:14 +02:00
commit 3f37458b7c
1 changed files with 1 additions and 4 deletions

View File

@ -1,13 +1,10 @@
A2M:=a2x -f manpage --asciidoc-opts="-f asciidoc.conf" A2M:=a2x -f manpage --asciidoc-opts="-f asciidoc.conf"
all: i3.1 i3-msg.1 i3-input.1 i3-nagbar.1 i3-wsbar.1 i3-config-wizard.1 i3-migrate-config-to-v4.1 i3-sensible-editor.1 i3-sensible-pager.1 i3-sensible-terminal.1 i3-dump-log.1 all: i3.1 i3-msg.1 i3-input.1 i3-nagbar.1 i3-config-wizard.1 i3-migrate-config-to-v4.1 i3-sensible-editor.1 i3-sensible-pager.1 i3-sensible-terminal.1 i3-dump-log.1
%.1: %.man asciidoc.conf %.1: %.man asciidoc.conf
${A2M} $< ${A2M} $<
i3-wsbar.1: ../i3-wsbar
pod2man $^ > $@
clean: clean:
for file in $$(echo i3 i3-msg i3-input i3-nagbar i3-wsbar i3-config-wizard i3-migrate-config-to-v4 i3-sensible-editor i3-sensible-pager i3-sensible-terminal i3-dump-log); \ for file in $$(echo i3 i3-msg i3-input i3-nagbar i3-wsbar i3-config-wizard i3-migrate-config-to-v4 i3-sensible-editor i3-sensible-pager i3-sensible-terminal i3-dump-log); \
do \ do \