Merge pull request #9143 from Habbie/travis-unbreak-trusty

[thirdparty/pdns.git] / docs / Makefile.am

diff --git a/docs/Makefile.am b/docs/Makefile.am
index 78568e0c2b1527e5ed7a107c9776bd2c40b89ae7..c428e069db0cf20af7600580de00650ad0840fbb 100644 (file)
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -13,13 +13,13 @@ MANPAGES_INSTALL += zone2ldap.1
 endif
 
 MANPAGES_TARGET_TOOLS = calidns.1 \
+       dnspcap2calidns.1 \
        dnsgram.1 \
        dnsreplay.1 \
        dnsscan.1 \
        dnsscope.1 \
        dnswasher.1 \
        dumresp.1 \
-       ixfrdist.1 \
        ixplore.1 \
        nproxy.1 \
        nsec3dig.1 \
@@ -27,7 +27,11 @@ MANPAGES_TARGET_TOOLS = calidns.1 \
        saxfr.1 \
        sdig.1
 
+MANPAGES_TARGET_IXFRDIST = ixfrdist.1 \
+       ixfrdist.yml.5
+
 MANPAGES_DIST += $(MANPAGES_TARGET_TOOLS) \
+       $(MANPAGES_TARGET_IXFRDIST) \
        dnsbulktest.1 \
        dnstcpbench.1 \
        dnspcap2protobuf.1
@@ -47,22 +51,45 @@ if TOOLS
 MANPAGES_INSTALL += $(MANPAGES_TARGET_TOOLS)
 endif
 
+if IXFRDIST
+MANPAGES_INSTALL += $(MANPAGES_TARGET_IXFRDIST)
+endif
+
 man_MANS = $(MANPAGES_INSTALL)
 
 EXTRA_DIST = $(MANPAGES_DIST)
 
 if HAVE_VIRTUALENV
 if !HAVE_MANPAGES
-$(MANPAGES_DIST): %: manpages/%.rst .venv
-       .venv/bin/python -msphinx -b man . mans $<
-       mv mans/$@ $@
+$(MANPAGES_DIST): %: mans/.complete manpages/%.rst
+       mv "$(<D)/$@" "$@" && rm -f "$<"
 endif # if !HAVE_MANPAGES
 
+mans/.complete: manpages := $(addprefix manpages/,$(addsuffix .rst,$(MANPAGES_DIST)))
+mans/.complete: .venv
+       rm -rf "$(@D).tmp"
+       .venv/bin/python -msphinx -b man . "$(@D).tmp" $(manpages) && rm -rf "$(@D)" && mv "$(@D).tmp" "$(@D)"
+       touch "$@"
+       rm -rf "$(@D).tmp"
+
 .venv: requirements.txt
        virtualenv .venv
        .venv/bin/pip install -U pip setuptools setuptools-git
        .venv/bin/pip install -r requirements.txt
 
+.NOTPARALLEL: \
+       all-docs \
+       upload-docs \
+       html-docs \
+       $(MANPAGES_DIST) \
+       latex/PowerDNS-Authoritative.pdf \
+       PowerDNS-Authoritative.pdf \
+       html-docs.tar.bz2
+
+clean-local:
+       rm -f latex/PowerDNS-Authoritative.pdf $(MANPAGES_DIST) html-docs.tar.bz2
+       rm -rf mans
+
 html-docs: common/** manpages/** .venv *.rst
        .venv/bin/python -msphinx -b html . html-docs