diff options
| author | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2010-05-26 14:03:20 +0100 |
|---|---|---|
| committer | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2010-05-26 14:06:11 +0100 |
| commit | 0f70a6b885fbc90e2413aa0e7f1b08e0cef45379 (patch) | |
| tree | 2730bc4b5865e2e8816284ee90e9e5fb82aa5244 | |
| parent | d1b800a4cec18c9db5b6c765c037359f22cdbda8 (diff) | |
| download | gstreamer-plugins-bad-0f70a6b885fbc90e2413aa0e7f1b08e0cef45379.tar.gz | |
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.
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | docs/plugins/Makefile.am | 14 | ||||
| -rw-r--r-- | docs/plugins/camerabin.dot (renamed from docs/plugins/figures/camerabin.dot) | 0 | ||||
| -rw-r--r-- | docs/plugins/camerabin.png (renamed from docs/plugins/figures/camerabin.png) | bin | 7779 -> 7779 bytes | |||
| -rw-r--r-- | docs/plugins/figures/Makefile.am | 12 |
5 files changed, 12 insertions, 15 deletions
diff --git a/configure.ac b/configure.ac index 448a91ae8..45067e9a5 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 da7b441ef..a454ae370 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 index a3fc2d5fe..a3fc2d5fe 100644 --- a/docs/plugins/figures/camerabin.dot +++ b/docs/plugins/camerabin.dot diff --git a/docs/plugins/figures/camerabin.png b/docs/plugins/camerabin.png Binary files differindex 7f82e1331..7f82e1331 100644 --- a/docs/plugins/figures/camerabin.png +++ b/docs/plugins/camerabin.png diff --git a/docs/plugins/figures/Makefile.am b/docs/plugins/figures/Makefile.am deleted file mode 100644 index e57da9031..000000000 --- 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) - |
