commit 4611d69309e42d1dbeb54264b977b2184e68c9ef
Author: Vivien Malerba <malerba gnome-db org>
Date: Mon Sep 16 21:38:50 2013 +0200
Port from gnome-doc-utils to yelp-utils, for bug #708017
.gitignore | 1 -
Makefile.am | 3 +--
configure.ac | 15 ++++++++++-----
doc/mallard/gda-vala/Makefile.am | 2 +-
m4/.gitignore | 1 -
tools/browser/help/.gitignore | 1 +
tools/browser/help/Makefile.am | 12 ++++++------
tools/help/Makefile.am | 2 +-
8 files changed, 20 insertions(+), 17 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index df9dfd3..52975de 100644
--- a/.gitignore
+++ b/.gitignore
@@ -53,5 +53,4 @@ mkkeywordhash
gtk-doc.make
xmldocs.make
omf.make
-gnome-doc-utils.make
ylwrap
diff --git a/Makefile.am b/Makefile.am
index 1e3632b..d42eebf 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -126,8 +126,7 @@ EXTRA_DIST = \
mkinstalldirs \
$(example_files) \
getsp.class \
- getsp.java \
- gnome-doc-utils.make
+ getsp.java
dist-hook:
@if test -d "$(srcdir)/.git"; \
diff --git a/configure.ac b/configure.ac
index f39a363..a2a0c89 100644
--- a/configure.ac
+++ b/configure.ac
@@ -127,12 +127,16 @@ LT_PREREQ([2.2.6])
LT_INIT([disable-static])
AC_PROG_MAKE_SET
-dnl -- Initialize docs
-GNOME_DOC_INIT([0.9.0],[have_gdu=yes],[have_gdu=no])
-if test x$have_gdu != xno; then
- AC_DEFINE(HAVE_GDU, [1], [GdaBrowser documentation is built])
+dnl -- Initialize help system
+AC_ARG_WITH(help,
+AS_HELP_STRING([--with-help], [Enable building help (GdaBrowser)]),
+ [with_gdu=$withval]
+ ,with_gdu=yes)
+if test x$with_gdu != xno; then
+ YELP_HELP_INIT
+ AC_DEFINE(HAVE_GDU, [1], [Help (GdaBrowser documentation) is built])
fi
-AM_CONDITIONAL(HAVE_GDU, test x$have_gdu != xno)
+AM_CONDITIONAL(HAVE_GDU, test x$with_gdu != xno)
dnl ******************************
dnl glib utilities
@@ -1045,6 +1049,7 @@ echo " Building Libxslt extension: `if test x$have_xslt != xno; then echo yes;
echo " Building libgda GObject Introspection: `if test x$enable_gda_gi = xyes; then echo yes; else echo
no; fi`"
echo " Building libgda-ui GObject Introspection: `if test x$enable_gdaui_gi != xno; then echo yes; else
echo no; fi`"
echo " Building Gtk-Doc: `if test x$enable_gtk_doc != xno; then echo yes; else echo no; fi`"
+echo " Building Help (GdaBrowser): `if test x$with_gdu != xno; then echo yes; else echo no; fi`"
echo " Building GDA Vala Bindings (--enable-vala): `if test x$vapigen_pkg_found != xyes; then echo no;
else echo yes; fi`"
echo " Building GDA-UI Vala Bindings: `if test x$enable_gdaui_vala != xyes; then echo no; else echo yes;
fi`"
echo " Building Vala Extensions: `if test x$enable_vala_ext != xno; then echo yes; else echo no; fi`"
diff --git a/doc/mallard/gda-vala/Makefile.am b/doc/mallard/gda-vala/Makefile.am
index df6cf77..f0aa596 100644
--- a/doc/mallard/gda-vala/Makefile.am
+++ b/doc/mallard/gda-vala/Makefile.am
@@ -1,6 +1,6 @@
SUBDIRS = C
-include $(top_srcdir)/gnome-doc-utils.make
+ YELP_HELP_RULES@
DOC_ID = gda-vala
diff --git a/m4/.gitignore b/m4/.gitignore
index bae0334..a73614a 100644
--- a/m4/.gitignore
+++ b/m4/.gitignore
@@ -1,4 +1,3 @@
-gnome-doc-utils.m4
gtk-doc.m4
intltool.m4
libtool.m4
diff --git a/tools/browser/help/.gitignore b/tools/browser/help/.gitignore
index ce040fc..bdc1861 100644
--- a/tools/browser/help/.gitignore
+++ b/tools/browser/help/.gitignore
@@ -1 +1,2 @@
gda-browser.omf
+*.stamp
diff --git a/tools/browser/help/Makefile.am b/tools/browser/help/Makefile.am
index 0a5abdf..a9fe63d 100644
--- a/tools/browser/help/Makefile.am
+++ b/tools/browser/help/Makefile.am
@@ -1,9 +1,9 @@
-include $(top_srcdir)/gnome-doc-utils.make
+ YELP_HELP_RULES@
-DOC_ID = gda-browser
+HELP_ID = gda-browser
-DOC_INCLUDES = legal.xml
-DOC_FIGURES = \
+HELP_EXTRA = legal.xml
+HELP_MEDIA = \
figures/action-1.png \
figures/action-2.png \
figures/action-3.png \
@@ -33,7 +33,7 @@ DOC_FIGURES = \
figures/ldap-search.png \
figures/ldap-table-mapping.png
-DOC_PAGES = \
+HELP_FILES = \
actions.page \
data-manager-perspective.page \
data-manager-xml-syntax.page \
@@ -53,6 +53,6 @@ DOC_PAGES = \
ldap-browser-perspective.page \
ldap-connections.page
-DOC_LINGUAS = cs de el es gl id pt_BR sl zh_CN
+HELP_LINGUAS = cs de el es gl id pt_BR sl zh_CN
dist-hook: doc-dist-hook
diff --git a/tools/help/Makefile.am b/tools/help/Makefile.am
index 8bbc3f0..f93c8d4 100644
--- a/tools/help/Makefile.am
+++ b/tools/help/Makefile.am
@@ -1,4 +1,4 @@
-include $(top_srcdir)/gnome-doc-utils.make
+ YELP_HELP_RULES@
DOC_ID = gda-sql
DOC_NOCHECK = yes