diff options
| author | Jon Cruz <jonc@osg.samsung.com> | 2015-01-30 18:07:24 -0800 |
|---|---|---|
| committer | Bryce Harrington <bryce@osg.samsung.com> | 2015-01-30 18:58:08 -0800 |
| commit | 23a57b69ffaad990172958ff1f64a687b8374a2d (patch) | |
| tree | 89863218d26acb27eec42ce5d6cec5d6badf6cbe | |
| parent | 768724495e2d15af0b9ea8303fe776201e6d49de (diff) | |
| download | wayland-23a57b69ffaad990172958ff1f64a687b8374a2d.tar.gz | |
doc: Fix out-of-tree build and also distcheck
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@osg.samsung.com>
Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>
| -rw-r--r-- | doc/doxygen/Makefile.am | 4 | ||||
| -rw-r--r-- | 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 c16a716..57728a0 100644 --- a/doc/publican/Makefile.am +++ b/doc/publican/Makefile.am @@ -158,4 +158,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 |