[gnome-desktop] Port to new documentation infrastructure

[Matthias Clasen <matthiasc src gnome org>]

commit 8b7e059e2c01ec67d8aaf33133e695efae2173f8
Author: Matthias Clasen <mclasen redhat com>
Date:   Sun Aug 5 21:26:20 2012 -0400

    Port to new documentation infrastructure
    
    This commit changes from using gnome-doc-utils to using yelp-tools.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=681264

 Makefile.am                                     |    3 +--
 configure.ac                                    |    4 ++--
 desktop-docs/fdl/C/{fdl.xml => index.docbook}   |    0
 desktop-docs/fdl/Makefile.am                    |   11 +++++------
 desktop-docs/gpl/C/{gpl.xml => index.docbook}   |    0
 desktop-docs/gpl/Makefile.am                    |   11 +++++------
 desktop-docs/lgpl/C/{lgpl.xml => index.docbook} |    0
 desktop-docs/lgpl/Makefile.am                   |   11 +++++------
 8 files changed, 18 insertions(+), 22 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 3ba35a2..9423b2a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,8 +18,7 @@ EXTRA_DIST =			\
 	HACKING			\
 	MAINTAINERS		\
 	ChangeLog.pre-git	\
-	gnome-version.xml.in.in \
-	gnome-doc-utils.make
+	gnome-version.xml.in.in
 
 CLEANFILES = \
 	$(version_DATA)
diff --git a/configure.ac b/configure.ac
index 6661789..0baced4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -173,9 +173,9 @@ if test x"$gnome_cv_timerfd" = x"yes"; then
   AC_DEFINE(HAVE_TIMERFD, 1, [we have the timerfd_create(2) system call])
 fi
 
-dnl gnome-doc-utils stuff
+dnl Documentation support
 
-GNOME_DOC_INIT
+YELP_HELP_INIT
 
 dnl Language Support
 
diff --git a/desktop-docs/fdl/C/fdl.xml b/desktop-docs/fdl/C/index.docbook
similarity index 100%
rename from desktop-docs/fdl/C/fdl.xml
rename to desktop-docs/fdl/C/index.docbook
diff --git a/desktop-docs/fdl/Makefile.am b/desktop-docs/fdl/Makefile.am
index 026a8d9..cae513b 100644
--- a/desktop-docs/fdl/Makefile.am
+++ b/desktop-docs/fdl/Makefile.am
@@ -1,10 +1,9 @@
-include $(top_srcdir)/gnome-doc-utils.make
-dist-hook: doc-dist-hook
+ YELP_HELP_RULES@
 
-DOC_MODULE = fdl
-DOC_ENTITIES = 
-DOC_INCLUDES = 
+HELP_ID = fdl
+HELP_FILES = index.docbook
+HELP_MEDIA =
 
-DOC_LINGUAS = ar ca el es eu fr gl hu ko oc pl sl sv uk vi de zh_CN
+HELP_LINGUAS = ar ca el es eu fr gl hu ko oc pl sl sv uk vi de zh_CN
 
 -include $(top_srcdir)/git.mk
diff --git a/desktop-docs/gpl/C/gpl.xml b/desktop-docs/gpl/C/index.docbook
similarity index 100%
rename from desktop-docs/gpl/C/gpl.xml
rename to desktop-docs/gpl/C/index.docbook
diff --git a/desktop-docs/gpl/Makefile.am b/desktop-docs/gpl/Makefile.am
index 9330256..2cfeaec 100644
--- a/desktop-docs/gpl/Makefile.am
+++ b/desktop-docs/gpl/Makefile.am
@@ -1,10 +1,9 @@
-include $(top_srcdir)/gnome-doc-utils.make
-dist-hook: doc-dist-hook
+ YELP_HELP_RULES@
 
-DOC_MODULE = gpl
-DOC_ENTITIES = 
-DOC_INCLUDES = 
+HELP_ID = gpl
+HELP_FILES = index.docbook
+HELP_MEDIA =
 
-DOC_LINGUAS = ar ca cs el es eu fi fr hu ko nds oc pa sl sr sr latin uk vi zh_CN sv de
+HELP_LINGUAS = ar ca cs el es eu fi fr hu ko nds oc pa sl sr sr latin uk vi zh_CN sv de
 
 -include $(top_srcdir)/git.mk
diff --git a/desktop-docs/lgpl/C/lgpl.xml b/desktop-docs/lgpl/C/index.docbook
similarity index 100%
rename from desktop-docs/lgpl/C/lgpl.xml
rename to desktop-docs/lgpl/C/index.docbook
diff --git a/desktop-docs/lgpl/Makefile.am b/desktop-docs/lgpl/Makefile.am
index d06fbd2..a08bafa 100644
--- a/desktop-docs/lgpl/Makefile.am
+++ b/desktop-docs/lgpl/Makefile.am
@@ -1,10 +1,9 @@
-include $(top_srcdir)/gnome-doc-utils.make
-dist-hook: doc-dist-hook
+ YELP_HELP_RULES@
 
-DOC_MODULE = lgpl
-DOC_ENTITIES = 
-DOC_INCLUDES = 
+HELP_ID = lgpl
+HELP_FILES = index.docbook
+HELP_MEDIA =
 
-DOC_LINGUAS = ar de el es eu fi fr hu ko oc pa pt_BR sl sv uk vi zh_CN
+HELP_LINGUAS = ar de el es eu fi fr hu ko oc pa pt_BR sl sv uk vi zh_CN
 
 -include $(top_srcdir)/git.mk