Use new documentation infraestructure

diff --git a/.gitignore b/.gitignore
index 8421cb18be7cf9f01e262ec17c7f4106ff6ba6f7..ad107c9caa53466f91b110ed4802b9f8d0b963ab 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -42,6 +42,5 @@ compile
 cscope.out
 tags
 TAGS
-gnome-doc-utils.make
 ABOUT-NLS
 config.rpath

diff --git a/configure.ac b/configure.ac
index cb92b839e28be09693467d83bea3f0a4cd251307..cde136b2386ebce0e65fffd6f00aaff7641520b6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -106,7 +106,6 @@ AC_PATH_XTRA
 LT_PREREQ([2.2])
 LT_INIT
 
-GNOME_DOC_INIT([0.17.3])
 AC_PATH_PROG(DBUS_BINDING_TOOL, dbus-binding-tool)
 GLIB_GSETTINGS
 GLIB_GENMARSHAL=`$PKG_CONFIG glib-2.0 --variable=glib_genmarshal`
@@ -646,6 +645,8 @@ else
 fi
 AM_CONDITIONAL(BUILD_CHEESE, test x${have_cheese} = xyes)
 
+# Help documentation
+YELP_HELP_INIT
 
 # -----------------------------------------------------------
 # Coding style checks

diff --git a/help/Makefile.am b/help/Makefile.am
index 45aa010cc3f81da4af6b45329d6b6e6b42b57f78..9bde991d44d5b57ee49932ad39bb440f01e27166 100644 (file)
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -1,7 +1,6 @@
-include $(top_srcdir)/gnome-doc-utils.make
 
-DOC_ID = empathy
-DOC_FIGURES = \
+HELP_ID = empathy
+HELP_MEDIA = \
        figures/audio-input-microphone.png \
        figures/available.png \
        figures/away.png \
@@ -14,7 +13,7 @@ DOC_FIGURES = \
        figures/gtk-remove.png \
        figures/offline.png
 
-DOC_PAGES = \
+HELP_FILES = \
        account-irc.page \
        account-jabber.page \
        accounts-window.page \
@@ -61,5 +60,4 @@ DOC_PAGES = \
        status-icons.page \
        video-call.page
 
-DOC_LINGUAS = ca cs de el en_GB es eu fi fr gl hu it pl ru sl sv zh_CN
-dist-hook: doc-dist-hook
+HELP_LINGUAS = ca cs de el en_GB es eu fi fr gl hu it pl ru sl sv zh_CN

diff --git a/m4/.gitignore b/m4/.gitignore
index 4642a34500d36bf4d78c437a8ef6e1837b89749c..17d186b848edd160a612f59013b6042522ab6260 100644 (file)
--- a/m4/.gitignore
+++ b/m4/.gitignore
@@ -1,6 +1,5 @@
 gtk-doc.m4
 intltool.m4
-gnome-doc-utils.m4
 libtool.m4
 ltoptions.m4
 ltsugar.m4