[grilo-plugins] Move examples/ to help/
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [grilo-plugins] Move examples/ to help/
- Date: Tue, 4 Dec 2012 10:20:25 +0000 (UTC)
commit d9b2ea8e61689e91bd11e4750c17843fbe4ce351
Author: Murray Cumming <murrayc murrayc com>
Date: Tue Dec 4 11:19:24 2012 +0100
Move examples/ to help/
This is necessary because our DocBook .xml file xincludes the
file with the relative path, and this caused the examples to
be above the installed grilo-plugins directory.
Makefile.am | 2 +-
configure.ac | 2 +-
help/C/grilo-plugins.xml | 2 +-
help/Makefile.am | 4 +++-
{examples => help/examples}/.gitignore | 0
{examples => help/examples}/Makefile.am | 0
{examples => help/examples}/example-tmdb.c | 0
7 files changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 1942743..3b030d4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,7 +7,7 @@
ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = src help examples test
+SUBDIRS = src help test
MAINTAINERCLEANFILES = \
aclocal.m4 \
diff --git a/configure.ac b/configure.ac
index c75996d..e98b964 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1005,8 +1005,8 @@ GNOME_DOC_INIT([0.9.0],,
AC_CONFIG_FILES([
Makefile
- examples/Makefile
help/Makefile
+ help/examples/Makefile
src/Makefile
src/apple-trailers/Makefile
src/bliptv/Makefile
diff --git a/help/C/grilo-plugins.xml b/help/C/grilo-plugins.xml
index 6553e18..0ceb7cd 100644
--- a/help/C/grilo-plugins.xml
+++ b/help/C/grilo-plugins.xml
@@ -147,7 +147,7 @@
<para>File: <ulink url="&url_examples_base;example-tmdb.c"><filename>example-tmdb.c</filename></ulink></para>
<programlisting>
-<xi:include href="../../examples/example-tmdb.c" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+<xi:include href="../examples/example-tmdb.c" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude"/>
</programlisting>
</sect1>
diff --git a/help/Makefile.am b/help/Makefile.am
index b5a8c36..2a232c4 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -1,9 +1,11 @@
+SUBDIRS = examples
+
include $(top_srcdir)/gnome-doc-utils.make
dist-hook: doc-dist-hook
DOC_MODULE = grilo-plugins
DOC_ENTITIES = legal.xml
-DOC_INCLUDES = ../../examples/example-tmdb.c
+DOC_INCLUDES = ../examples/example-tmdb.c
DOC_FIGURES =
DOC_LINGUAS =
diff --git a/examples/.gitignore b/help/examples/.gitignore
similarity index 100%
rename from examples/.gitignore
rename to help/examples/.gitignore
diff --git a/examples/Makefile.am b/help/examples/Makefile.am
similarity index 100%
rename from examples/Makefile.am
rename to help/examples/Makefile.am
diff --git a/examples/example-tmdb.c b/help/examples/example-tmdb.c
similarity index 100%
rename from examples/example-tmdb.c
rename to help/examples/example-tmdb.c
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]