[PATCH 1/2] doc: there is no need to move the _8h files

Bill Spitzak spitzak at gmail.com
Thu Jan 8 19:21:28 PST 2015


The current xslt skips all the data that is in them, so it is ok
if they are included.
---
 doc/publican/Makefile.am |    8 --------
 1 file changed, 8 deletions(-)

diff --git a/doc/publican/Makefile.am b/doc/publican/Makefile.am
index ed2a645..4020a7c 100644
--- a/doc/publican/Makefile.am
+++ b/doc/publican/Makefile.am
@@ -91,21 +91,13 @@ $(builddir)/en-US/ProtocolInterfaces.xml: $(top_srcdir)/protocol/wayland.xml $(s
 	$(AM_V_GEN)$(XSLTPROC) $(srcdir)/protocol-interfaces-to-docbook.xsl \
 		$(top_srcdir)/protocol/wayland.xml > $@
 
-# * we don't want wayland-{server|client}_8h.xml to avoid duplicating output methods,
-#   move it out of the way first.
 # * use doxygen's combine.xslt to merge the xml files into one single file
 # * pipe that through the doxygen-to-publican stylesheet
-# * move wayland-<foo>_8h.xml back to its original location
 $(builddir)/en-US/%API.xml: $(doxydir)/xml/%/index.xml $(srcdir)/doxygen-to-publican.xsl | $(builddir)/en-US
-	$(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 | \
 		$(XSLTPROC) --stringparam which $* \
 		$(srcdir)/doxygen-to-publican.xsl - > $@
-	$(AM_V_at)mv $(doxydir)/xml/$*/saved/* \
-		$(doxydir)/xml/$*
 
 # Copy the sources source files into en-US destination
 # This is required for out-of-source-tree build as publican does not allow us
-- 
1.7.9.5



More information about the wayland-devel mailing list