[grilo-plugins] Port from gnome-doc-utils to yelp
- From: Juan A. Suarez Romero <jasuarez src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [grilo-plugins] Port from gnome-doc-utils to yelp
- Date: Fri, 31 Jan 2014 11:15:52 +0000 (UTC)
commit 53700c05fa80770183642c3c1d7e58a02bc9f34a
Author: Baptiste Mille-Mathias <baptiste millemathias gmail com>
Date: Sat Jan 25 18:34:36 2014 +0000
Port from gnome-doc-utils to yelp
Ditch gnome-doc-utils which is obsolete now in favor of yelp
Thanks to David King for the help.
https://bugzilla.gnome.org/show_bug.cgi?id=699317
.gitignore | 1 -
Makefile.am | 5 ++---
autogen.sh | 2 --
configure.ac | 7 +++++--
help/Makefile.am | 18 +++++++-----------
5 files changed, 14 insertions(+), 19 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 761d803..e1713c5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,7 +26,6 @@ omf.make
stamp-h1
test-driver
xmldocs.make
-gnome-doc-utils.make
/m4/*.m4
!/m4/grilo.m4
diff --git a/Makefile.am b/Makefile.am
index 1cff840..a4702f6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,15 +28,14 @@ MAINTAINERCLEANFILES = \
mkinstalldirs \
*~
-DISTCLEANFILES = $(MAINTAINERCLEANFILES) gnome-doc-utils.make
+DISTCLEANFILES = $(MAINTAINERCLEANFILES)
EXTRA_DIST += ./m4/grilo.m4
# Make sure that the documentation generation is enabled
# when creating tarball releases,
# and make sure that we enable all plugins needed by the documentation.
-DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper \
- --enable-apple-trailers \
+DISTCHECK_CONFIGURE_FLAGS = --enable-apple-trailers \
--enable-bliptv \
--enable-bookmarks \
--enable-dmap \
diff --git a/autogen.sh b/autogen.sh
index 63f0827..46d2b4d 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -17,8 +17,6 @@ which gnome-autogen.sh || {
exit 1
}
-gnome-doc-prepare --automake --copy --force
REQUIRED_AUTOMAKE_VERSION=1.8 \
USE_GNOME2_MACROS=1 \
-USE_COMMON_DOC_BUILD=yes \
. gnome-autogen.sh "$@"
diff --git a/configure.ac b/configure.ac
index 520b288..d7171de 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1126,8 +1126,11 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [The domain to use with g
AC_SUBST([abs_top_builddir])
AC_SUBST([builddir])
-GNOME_DOC_INIT([0.9.0],,
- [AC_MSG_WARN([[gnome-doc-utils not found: tutorial will not be built.]])])
+# ----------------------------------------------------------
+# DOCUMENTATION
+# ----------------------------------------------------------
+
+YELP_HELP_INIT
# ----------------------------------------------------------
# OUTPUT
diff --git a/help/Makefile.am b/help/Makefile.am
index 4fdb59a..a2ae303 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -1,18 +1,14 @@
SUBDIRS = examples
-include $(top_srcdir)/gnome-doc-utils.make
+ YELP_HELP_RULES@
include $(top_srcdir)/gtester.mk
-dist-hook: doc-dist-hook
-
-DOC_MODULE = grilo-plugins
-DOC_ENTITIES = legal.xml
-DOC_INCLUDES = ../examples/example-tmdb.c
-DOC_FIGURES =
-
-DOC_LINGUAS =
-
-
+HELP_ID = grilo-plugins
+HELP_FILES = grilo-plugins.xml
+HELP_EXTRA = legal.xml
+#DOC_INCLUDES = ../examples/example-tmdb.c
+HELP_MEDIA =
+HELP_LINGUAS =
# For manual checking:
XMLLINT = xmllint
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]