summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBill Spitzak <spitzak@gmail.com>2014-12-16 19:23:02 -0800
committerPekka Paalanen <pekka.paalanen@collabora.co.uk>2014-12-18 15:07:22 +0200
commit3f05c4ac4a747f5296f24424925eda292ccbe7d4 (patch)
treed69ee1b79619a3c6157936abdcb524cc473cb8f8
parentc985a17988e4df48618b6687dfddfb18a94793e1 (diff)
downloadwayland-3f05c4ac4a747f5296f24424925eda292ccbe7d4.tar.gz
doc: fix for parallel make
Move the *_8h.xml files to a per-chapter temporary file so two chapters can be converted from doxygen at the same time. Tested with make -j 9. Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>
-rw-r--r--doc/publican/Makefile.am7
1 files changed, 4 insertions, 3 deletions
diff --git a/doc/publican/Makefile.am b/doc/publican/Makefile.am
index c109795..b4cfe82 100644
--- a/doc/publican/Makefile.am
+++ b/doc/publican/Makefile.am
@@ -94,11 +94,12 @@ $(builddir)/en-US/ProtocolInterfaces.xml: $(top_srcdir)/protocol/wayland.xml $(s
# * use doxygen's combine.xslt to merge the xml files into one single file
# * move wayland-<foo>_8h.xml back to its original location
$(builddir)/en-US/%API.xml.tmp: $(doxydir)/xml/%/index.xml | $(builddir)/en-US
- $(AM_V_at)mv $(doxydir)/xml/$*/wayland-$*_8h.xml \
- $(doxydir)/xml/
+ $(AM_V_at)$(MKDIR_P) $(doxydir)/xml/$*/saved
+ $(AM_V_at)mv $(doxydir)/xml/$*/wayland-*_8h.xml \
+ $(doxydir)/xml/$*/saved
$(AM_V_GEN)$(XSLTPROC) $(doxydir)/xml/$*/combine.xslt \
$(doxydir)/xml/$*/index.xml > $@
- $(AM_V_at)mv $(doxydir)/xml/wayland-$*_8h.xml \
+ $(AM_V_at)mv $(doxydir)/xml/$*/saved/* \
$(doxydir)/xml/$*
# WaylandClientAPI.xml: