[PATCH 3/4] doc: put doxygen output into $publican_sources

Bill Spitzak spitzak at gmail.com
Fri Dec 5 19:04:07 PST 2014


This removes the need to name them multiple times
---
 doc/publican/Makefile.am |   14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/doc/publican/Makefile.am b/doc/publican/Makefile.am
index c9a6274..d4514cc 100644
--- a/doc/publican/Makefile.am
+++ b/doc/publican/Makefile.am
@@ -28,7 +28,11 @@ publican_sources = \
 	$(srcdir)/sources/images/icon.svg  \
 	$(srcdir)/sources/images/wayland-architecture.png \
 	$(srcdir)/sources/images/wayland.png  \
-	$(srcdir)/sources/images/x-architecture.png
+	$(srcdir)/sources/images/x-architecture.png \
+	en-US/ProtocolSpec.xml \
+	en-US/ProtocolInterfaces.xml \
+	en-US/WaylandClientAPI.xml \
+	en-US/WaylandServerAPI.xml
 
 css_sources = \
 	$(srcdir)/sources/css/brand.css \
@@ -63,9 +67,7 @@ Wayland: $(publican_targets)
 
 pubdir = $(docdir)/Wayland/en-US
 
-publican_targets = $(publican_sources:$(srcdir)/sources%=$(builddir)/en-US%) \
-	en-US/ProtocolSpec.xml en-US/ProtocolInterfaces.xml \
-	en-US/WaylandClientAPI.xml en-US/WaylandServerAPI.xml
+publican_targets = $(publican_sources:$(srcdir)/sources%=$(builddir)/en-US%)
 
 # The Protocol.xml is purely generated and required before running publican
 en-US/ProtocolSpec.xml: $(top_srcdir)/protocol/wayland.xml $(srcdir)/protocol-to-docbook.xsl
@@ -104,11 +106,11 @@ en-US/WaylandServerAPI.xml: en-US/serverAPI.xml.tmp $(srcdir)/doxygen-to-publica
 # Copy the sources source files into en-US destination
 # This is required for out-of-source-tree build as publican does not allow us
 # to specify the location of the source code.
-$(builddir)/en-US/%: $(srcdir)/sources/% en-US/ProtocolSpec.xml en-US/ProtocolInterfaces.xml en-US/WaylandClientAPI.xml $(publican_sources)
+$(builddir)/en-US/%: $(srcdir)/sources/% $(publican_sources)
 	$(AM_V_GEN)cp -f $< $@
 	$(AM_V_GEN)chmod a+w $@
 
-CLEANFILES = en-US/ProtocolSpec.xml en-US/ProtocolInterfaces.xml en-US/WaylandClientAPI.xml $(publican_targets)
+CLEANFILES = $(publican_targets)
 
 clean-local:
 	$(AM_V_at)rm -fr $(builddir)/en-US
-- 
1.7.9.5



More information about the wayland-devel mailing list