[PATCH] doc: Fix out-of-tree build and also distcheck

[Bryce Harrington]

On Fri, Jan 30, 2015 at 06:07:24PM -0800, Jon A. Cruz wrote:
> Corrects an issue that would cause out-of-tree builds to fail and also
> a few items that would cause distcheck to fail.
> 
> Signed-off-by: Jon A. Cruz <jonc at osg.samsung.com>

Thanks, applied.

> ---
>  doc/doxygen/Makefile.am  | 4 +++-
>  doc/publican/Makefile.am | 7 ++++++-
>  2 files changed, 9 insertions(+), 2 deletions(-)
> 
> diff --git a/doc/doxygen/Makefile.am b/doc/doxygen/Makefile.am
> index 283e077..edf3652 100644
> --- a/doc/doxygen/Makefile.am
> +++ b/doc/doxygen/Makefile.am
> @@ -24,7 +24,7 @@ scanned_src_files_man =					\
>  	$(top_srcdir)/src/wayland-client.c	\
>  	$(top_srcdir)/src/wayland-client.h
>  
> -diagramsdir := dot
> +diagramsdir := $(srcdir)/dot
>  diagramssrc := $(wildcard $(diagramsdir)/*.gv)
>  diagrams := $(patsubst $(diagramsdir)/%,xml/%,$(diagramssrc:.gv=.png))
>  diagram_maps := $(patsubst $(diagramsdir)/%,xml/%,$(diagramssrc:.gv=.map))
> @@ -72,3 +72,5 @@ all-local: man/man3/wl_display.3
>  clean-local:
>  	rm -rf xml/
>  	rm -rf man/
> +
> +EXTRA_DIST = $(diagramssrc)
> diff --git a/doc/publican/Makefile.am b/doc/publican/Makefile.am
> index 4a7f225..4f1bebf 100644
> --- a/doc/publican/Makefile.am
> +++ b/doc/publican/Makefile.am
> @@ -156,4 +156,9 @@ uninstall-local:
>  endif
>  endif
>  
> -EXTRA_DIST = $(publican_sources) $(css_sources) $(img_sources) protocol-to-docbook.xsl protocol-interfaces-to-docbook.xsl doxygen-to-publican.xsl
> +EXTRA_DIST = \
> +	$(publican_sources) $(processed_sources) $(css_sources) $(img_sources) \
> +	protocol-to-docbook.xsl \
> +	protocol-interfaces-to-docbook.xsl \
> +	doxygen-to-publican.xsl \
> +	merge-mapcoords.xsl
> -- 
> 2.1.0
> 
> _______________________________________________
> wayland-devel mailing list
> wayland-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/wayland-devel