diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | help/Makefile.am | 10 | ||||
| -rw-r--r-- | m4/.gitignore | 1 |
4 files changed, 6 insertions, 9 deletions
diff --git a/.gitignore b/.gitignore index 8421cb18b..ad107c9ca 100644 --- 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 cb92b839e..cde136b23 100644 --- 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 45aa010cc..9bde991d4 100644 --- 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 4642a3450..17d186b84 100644 --- 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 |