[gnome-terminal] help: Use modern yelp-tools build system



commit e1d7b40ecf76c14e05030c1c116214c7e73350d6
Author: Jeremy Bicha <jbicha ubuntu com>
Date:   Mon May 28 20:47:36 2012 -0400

    help: Use modern yelp-tools build system
    
    https://bugzilla.gnome.org/show_bug.cgi?id=677003

 Makefile.am                                  |    2 --
 autogen.sh                                   |    1 +
 configure.ac                                 |    2 +-
 help/C/{gnome-terminal.xml => index.docbook} |    0
 help/Makefile.am                             |   20 ++++++++------------
 5 files changed, 10 insertions(+), 15 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index abfc4c9..47a5182 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,7 +19,6 @@ EXTRA_DIST = 			\
 	ChangeLog.pre-2-23	\
 	ChangeLog.README	\
 	HACKING			\
-	gnome-doc-utils.make	\
 	xmldocs.make		\
 	omf.make		\
 	$(NULL)
@@ -44,7 +43,6 @@ MAINTAINERCLEANFILES = \
 	$(srcdir)/mkinstalldirs \
 	$(srcdir)/omf.make \
 	$(srcdir)/xmldocs.make \
-	$(srcdir)/gnome-doc-utils.make	\
 	`find "$(srcdir)" -type f -name Makefile.in -print` \
 	$(NULL)
 
diff --git a/autogen.sh b/autogen.sh
index 632be31..5b19f75 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -6,6 +6,7 @@ test -z "$srcdir" && srcdir=.
 
 REQUIRED_AUTOMAKE_VERSION=1.9
 REQUIRED_INTLTOOL_VERSION=0.40.4
+REQUIRED_YELP_TOOLS_VERSION=3.1.1
 
 PKG_NAME="gnome-terminal"
 
diff --git a/configure.ac b/configure.ac
index bf7927e..4f6757f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -199,7 +199,7 @@ CC_CHECK_CFLAGS_APPEND([ \
 # Documentation
 # *************
 
-GNOME_DOC_INIT
+YELP_HELP_INIT
 
 # ****************************
 
diff --git a/help/C/gnome-terminal.xml b/help/C/index.docbook
similarity index 100%
rename from help/C/gnome-terminal.xml
rename to help/C/index.docbook
diff --git a/help/Makefile.am b/help/Makefile.am
index 3e97032..651505a 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -1,17 +1,13 @@
-include $(top_srcdir)/gnome-doc-utils.make
-dist-hook: doc-dist-hook
+ YELP_HELP_RULES@
+HELP_ID = gnome-terminal
 
-DOC_MODULE = gnome-terminal
-DOC_ENTITIES = legal.xml
-DOC_INCLUDES = 
-DOC_FIGURES = figures/gnome-terminal-default.png \
-              figures/gnome-terminal-tabbed.png 
-#	      figures/terminal-window.png   This image is not used.
+HELP_MEDIA = figures/gnome-terminal-default.png \
+	figures/gnome-terminal-tabbed.png
 
-DOC_LINGUAS = da de ca cs el en_GB es fr gl it ko oc pt_BR ru sl sv te uk zh_CN
+HELP_FILES = \
+	index.docbook \
+	legal.xml
 
-# Move to DOC_LINGUAS in transition to gnome-doc-utils
-
-SUBDIRS = bg ro ja zh_TW
+HELP_LINGUAS = ca cs da de el en_GB es fr gl it ko oc pt_BR ru sl sv te uk zh_CN
 
 -include $(top_srcdir)/git.mk



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]