From 0f70a6b885fbc90e2413aa0e7f1b08e0cef45379 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim.muller@collabora.co.uk>
Date: Wed, 26 May 2010 14:03:20 +0100
Subject: [PATCH] docs: fix dist/distcheck issues with camerabin figures

Move figures into docs/plugins as well, to avoid issues with
make dist and make distcheck (make distdir will not first descend
into child directories). Out-of-source build seems to still work
as well.
---
 configure.ac                             |   1 -
 docs/plugins/Makefile.am                 |  14 ++++++++++++--
 docs/plugins/{figures => }/camerabin.dot |   0
 docs/plugins/{figures => }/camerabin.png | Bin
 docs/plugins/figures/Makefile.am         |  12 ------------
 5 files changed, 12 insertions(+), 15 deletions(-)
 rename docs/plugins/{figures => }/camerabin.dot (100%)
 rename docs/plugins/{figures => }/camerabin.png (100%)
 delete mode 100644 docs/plugins/figures/Makefile.am

diff --git a/configure.ac b/configure.ac
index 448a91ae84..45067e9a53 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1775,7 +1775,6 @@ ext/zbar/Makefile
 po/Makefile.in
 docs/Makefile
 docs/plugins/Makefile
-docs/plugins/figures/Makefile
 docs/version.entities
 pkgconfig/Makefile
 pkgconfig/gstreamer-plugins-bad.pc
diff --git a/docs/plugins/Makefile.am b/docs/plugins/Makefile.am
index da7b441ef0..a454ae370d 100644
--- a/docs/plugins/Makefile.am
+++ b/docs/plugins/Makefile.am
@@ -169,7 +169,7 @@ EXTRA_HFILES = \
 	$(top_srcdir)/gst-libs/gst/interfaces/photography.h
 
 # Images to copy into HTML directory.
-HTML_IMAGES = figures/*.png
+HTML_IMAGES = camerabin.png
 
 # Extra SGML files that are included by $(DOC_MAIN_SGML_FILE).
 content_files =
@@ -192,4 +192,14 @@ DOC_OVERRIDES =
 
 include $(top_srcdir)/common/gtk-doc-plugins.mak
 
-SUBDIRS = figures
+SUBDIRS =
+
+FIGURES_SOURCEFILES = camerabin.dot
+FIGURES_IMAGES      = camerabin.png
+
+EXTRA_DIST += $(FIGURES_SOURCEFILES)
+
+.dot.png:
+	dot -Tpng $< -o$@
+
+update-figures: $(FIGURES_IMAGES)
diff --git a/docs/plugins/figures/camerabin.dot b/docs/plugins/camerabin.dot
similarity index 100%
rename from docs/plugins/figures/camerabin.dot
rename to docs/plugins/camerabin.dot
diff --git a/docs/plugins/figures/camerabin.png b/docs/plugins/camerabin.png
similarity index 100%
rename from docs/plugins/figures/camerabin.png
rename to docs/plugins/camerabin.png
diff --git a/docs/plugins/figures/Makefile.am b/docs/plugins/figures/Makefile.am
deleted file mode 100644
index e57da9031c..0000000000
--- a/docs/plugins/figures/Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
-SOURCES=camerabin.dot
-IMAGES =camerabin.png
-
-EXTRA_DIST=$(SOURCES)
-
-.PHONY: update
-
-.dot.png:
-	dot -Tpng $< -o$@
-
-update: $(IMAGES)
-