[PATCH 1/2] doc: fix for parallel make

Bill Spitzak spitzak at gmail.com
Tue Dec 16 19:23:02 PST 2014


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.
---
 doc/publican/Makefile.am |    7 ++++---
 1 file 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:
-- 
1.7.9.5



More information about the wayland-devel mailing list