doc: there is no need to move the _8h files
authorBill Spitzak <spitzak@gmail.com>
Sat, 24 Jan 2015 01:41:06 +0000 (17:41 -0800)
committerBryce Harrington <bryce@osg.samsung.com>
Tue, 27 Jan 2015 01:54:54 +0000 (17:54 -0800)
The current xslt skips all the data that is in them, so it is ok
if they are included.

Reviewed-by: "Jon A. Cruz" <jonc@osg.samsung.com>
Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>
doc/publican/Makefile.am

index 278da12..332399d 100644 (file)
@@ -89,21 +89,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