GNOME.org
 

[gnome-devel-docs] Move to yelp.m4

commit a3490a60d11387b472212465216614ee6cd2a174
Author: Shaun McCance <shaunm gnome org>
Date:   Wed Oct 31 10:48:29 2012 -0400

    Move to yelp.m4

 Makefile.am                                        |    4 --
 ...accessibility-devel-guide.xml => index.docbook} |    0
 accessibility-devel-guide/Makefile.am              |   17 ++++---
 configure.ac                                       |    2 +-
 hig/C/{hig-book.xml => index.docbook}              |    0
 hig/Makefile.am                                    |   14 +++---
 .../C/{integration-guide.xml => index.docbook}     |    0
 integration-guide/Makefile.am                      |    9 ++--
 .../C/{optimization-guide.xml => index.docbook}    |    0
 optimization-guide/Makefile.am                     |   20 ++++----
 platform-demos/Makefile.am                         |   57 +++++++++----------
 platform-overview/Makefile.am                      |   15 ++----
 12 files changed, 64 insertions(+), 74 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index b600cee..afa38fe 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,7 +5,3 @@ SUBDIRS =				\
 	integration-guide		\
 	optimization-guide		\
 	platform-overview
-
-EXTRA_DIST = gnome-doc-utils.make
-DISTCLEANFILE = gnome-doc-utils.make
-DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper
diff --git a/accessibility-devel-guide/C/accessibility-devel-guide.xml b/accessibility-devel-guide/C/index.docbook
similarity index 100%
rename from accessibility-devel-guide/C/accessibility-devel-guide.xml
rename to accessibility-devel-guide/C/index.docbook
diff --git a/accessibility-devel-guide/Makefile.am b/accessibility-devel-guide/Makefile.am
index 1ec93bd..52c9eb7 100644
--- a/accessibility-devel-guide/Makefile.am
+++ b/accessibility-devel-guide/Makefile.am
@@ -1,10 +1,12 @@
-include $(top_srcdir)/gnome-doc-utils.make
-dist-hook: doc-dist-hook
+ YELP_HELP_RULES@
 
-DOC_MODULE = accessibility-devel-guide
-DOC_ENTITIES = gad.xml gtest.xml legal.xml
-DOC_INCLUDES =
-DOC_FIGURES =						\
+HELP_ID = accessibility-devel-guide
+
+HELP_FILES = index.docbook
+
+HELP_EXTRA = gad.xml gtest.xml legal.xml
+
+HELP_MEDIA =						\
 	figures/at-arch.png				\
 	figures/badfocus1.png				\
 	figures/badfocus2.png				\
@@ -23,4 +25,5 @@ DOC_FIGURES =						\
 	figures/label_left.png				\
 	figures/label_right.png				\
 	figures/nodrop.png
-DOC_LINGUAS = de el es fr ja pt_BR sl
+
+HELP_LINGUAS = de el es fr ja pt_BR sl
diff --git a/configure.ac b/configure.ac
index 95a4bc6..85d1ff9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ AC_INIT([gnome-devel-docs],[3.6.1])
 AM_INIT_AUTOMAKE([no-dist-gzip dist-xz])
 AM_MAINTAINER_MODE([enable])
 
-GNOME_DOC_INIT
+YELP_HELP_INIT
 
 AC_OUTPUT([
 Makefile
diff --git a/hig/C/hig-book.xml b/hig/C/index.docbook
similarity index 100%
rename from hig/C/hig-book.xml
rename to hig/C/index.docbook
diff --git a/hig/Makefile.am b/hig/Makefile.am
index 6fdf9d0..0d59e94 100644
--- a/hig/Makefile.am
+++ b/hig/Makefile.am
@@ -1,9 +1,8 @@
-include $(top_srcdir)/gnome-doc-utils.make
-dist-hook: doc-dist-hook
+ YELP_HELP_RULES@
 
-DOC_MODULE = hig-book
-DOC_LINGUAS = de el es fr sl zh_CN zh_HK zh_TW
-DOC_ENTITIES =			\
+HELP_ID = hig-book
+HELP_LINGUAS = de el es fr sl zh_CN zh_HK zh_TW
+HELP_FILES =			\
 	hig-ch-bibliography.xml	\
 	hig-ch-checks.xml	\
 	hig-ch-controls.xml	\
@@ -21,8 +20,9 @@ DOC_ENTITIES =			\
 	hig-ch-principles.xml	\
 	hig-ch-toolbars.xml	\
 	hig-ch-windows.xml      \
-	hig-ch-whatsnew.xml
-DOC_FIGURES =						\
+	hig-ch-whatsnew.xml	\
+	index.docbook
+HELP_MEDIA =					\
 	images/controls-buttons.png \
 	images/controls-check-box-ambiguous.png \
 	images/controls-check-boxes-mixed.png \
diff --git a/integration-guide/C/integration-guide.xml b/integration-guide/C/index.docbook
similarity index 100%
rename from integration-guide/C/integration-guide.xml
rename to integration-guide/C/index.docbook
diff --git a/integration-guide/Makefile.am b/integration-guide/Makefile.am
index 53b7774..c8684e6 100644
--- a/integration-guide/Makefile.am
+++ b/integration-guide/Makefile.am
@@ -1,6 +1,5 @@
-include $(top_srcdir)/gnome-doc-utils.make
-dist-hook: doc-dist-hook
+ YELP_HELP_RULES@
 
-DOC_MODULE = integration-guide
-DOC_FIGURES =
-DOC_LINGUAS = cs de el en_GB es fr gl it pt_BR sl sv zh_CN
+HELP_ID = integration-guide
+HELP_FILES = index.docbook
+HELP_LINGUAS = cs de el en_GB es fr gl it pt_BR sl sv zh_CN
diff --git a/optimization-guide/C/optimization-guide.xml b/optimization-guide/C/index.docbook
similarity index 100%
rename from optimization-guide/C/optimization-guide.xml
rename to optimization-guide/C/index.docbook
diff --git a/optimization-guide/Makefile.am b/optimization-guide/Makefile.am
index 5e94fcc..3063b1f 100644
--- a/optimization-guide/Makefile.am
+++ b/optimization-guide/Makefile.am
@@ -1,13 +1,13 @@
-include $(top_srcdir)/gnome-doc-utils.make
-dist-hook: doc-dist-hook
+ YELP_HELP_RULES@
 
-DOC_MODULE = optimization-guide
+HELP_ID = optimization-guide
 DOC_LINGUAS = cs de el es fr gl sl zh_CN
 DOC_ENTITIES =
-DOC_INCLUDES = \
-  optimization-harmful.xml \
-  optimization-massif.xml \
-  optimization-intro.xml
-DOC_FIGURES =						\
-  figures/massif-after.png \
-  figures/massif-before.png
+HELP_FILES =				\
+	index.docbook			\
+	optimization-harmful.xml	\
+	optimization-massif.xml		\
+	optimization-intro.xml
+HELP_MEDIA =				\
+	figures/massif-after.png	\
+	figures/massif-before.png
diff --git a/platform-demos/Makefile.am b/platform-demos/Makefile.am
index ea24e1b..ff799e1 100644
--- a/platform-demos/Makefile.am
+++ b/platform-demos/Makefile.am
@@ -1,10 +1,10 @@
-include $(top_srcdir)/gnome-doc-utils.make
+ YELP_HELP_RULES@
 
-DOC_ID = gnome-devel-demos
+HELP_ID = gnome-devel-demos
 
-DOC_LINGUAS = ca de el es fr gl
+HELP_LINGUAS = ca de el es fr gl
 
-demo_sources = \
+demo_sources =	\
 	audio-player/audio-player.vala		\
 	exercises/menubar.vala.exercises	\
 	guitar-tuner/guitar-tuner.c		\
@@ -18,15 +18,15 @@ demo_sources = \
 	image-viewer/image-viewer.py		\
 	image-viewer/image-viewer.vala		\
 	magic-mirror/magic-mirror.vala		\
-	magic-mirror/magic-mirror-advanced.vala \
+	magic-mirror/magic-mirror-advanced.vala	\
 	message-board/message-board.c		\
 	photo-wall/photo-wall.c			\
 	record-collection/record-collection.js	\
 	samples/02_welcome_to_the_grid.js	\
-	samples/03_getting_the_signal_01.js			\
-	samples/03_getting_the_signal_02.js			\
-	samples/03_getting_the_signal_03.js			\
-	samples/03_getting_the_signal_04.js			\
+	samples/03_getting_the_signal_01.js	\
+	samples/03_getting_the_signal_02.js	\
+	samples/03_getting_the_signal_03.js	\
+	samples/03_getting_the_signal_04.js	\
 	samples/aboutdialog.c			\
 	samples/aboutdialog.js			\
 	samples/aboutdialog.py			\
@@ -58,7 +58,7 @@ demo_sources = \
 	samples/filechooserdialog.py		\
 	samples/filechooserdialog.ui		\
 	samples/filechooserdialog.vala		\
-	samples/fontchooserwidget.py			\
+	samples/fontchooserwidget.py		\
 	samples/fruitbat.png			\
 	samples/gentoopenguin.png		\
 	samples/gmenu.c				\
@@ -109,7 +109,7 @@ demo_sources = \
 	samples/messagedialog.py		\
 	samples/messagedialog.vala		\
 	samples/muteswan.png			\
-	samples/paned.py				\
+	samples/paned.py			\
 	samples/progressbar.c			\
 	samples/progressbar.js			\
 	samples/progressbar.py			\
@@ -156,21 +156,21 @@ demo_sources = \
 	samples/toolbar_builder.py		\
 	samples/toolbar_builder.ui		\
 	samples/toolbar_builder.vala		\
-	samples/tooltip.py		\
+	samples/tooltip.py			\
 	samples/treeview_advanced_liststore.py	\
 	samples/treeview_cellrenderertoggle.py	\
 	samples/treeview_simple_liststore.js	\
 	samples/treeview_simple_liststore.py	\
 	samples/treeview_simple_liststore.vala	\
-	samples/treeview_treestore.py	\
-	samples/tux.png			\
+	samples/treeview_treestore.py		\
+	samples/tux.png				\
 	samples/window.c			\
 	samples/window.js			\
 	samples/window.py			\
 	samples/window.vala			\
 	media/gnome-devtools.catalog
 
-DOC_FIGURES = \
+HELP_MEDIA =	\
 	media/02_jsgrid_01.png		\
 	media/02_jsgrid_02.png		\
 	media/02_jsgrid_03.png		\
@@ -210,7 +210,7 @@ DOC_FIGURES = \
 	media/gmenu.py.png			\
 	media/gmenu.vala.png			\
 	media/grid.png				\
-	media/grid_simple.png				\
+	media/grid_simple.png			\
 	media/guitar-tuner.png			\
 	media/guitar-tuner-glade.png		\
 	media/guitar-tuner-pipeline.png		\
@@ -226,7 +226,7 @@ DOC_FIGURES = \
 	media/message-board.ogv			\
 	media/messagedialog.png			\
 	media/opensuse.png			\
-	media/paned.png					\
+	media/paned.png				\
 	media/photo-wall.png			\
 	media/photo-wall-focused.png		\
 	media/progressbar.ogv			\
@@ -257,15 +257,15 @@ DOC_FIGURES = \
 	media/treeview_cellrenderertoggle.png	\
 	media/treeview_simple_liststore.png	\
 	media/treeview_simple_liststore_penguins.png	\
-	media/treeview_treestore.png	\
+	media/treeview_treestore.png		\
 	media/ubuntu.png			\
 	media/weatherAppJs.png			\
 	media/window.png			\
 	$(demo_sources)
 
-DOC_PAGES =				\
-	02_welcome_to_the_grid.js.page		\
-	03_getting_the_signal.js.page		\
+HELP_FILES =				\
+	02_welcome_to_the_grid.js.page	\
+	03_getting_the_signal.js.page	\
 	aboutdialog.c.page		\
 	aboutdialog.js.page		\
 	aboutdialog.py.page		\
@@ -347,19 +347,18 @@ DOC_PAGES =				\
 	linkbutton.py.page		\
 	linkbutton.vala.page		\
 	magic-mirror.vala.page		\
-	menubar.py.page		\
+	menubar.py.page			\
 	menubar.vala.page		\
 	menubutton.js.page		\
 	menubutton.py.page		\
 	menubutton.vala.page		\
-	menubutton.py.page		\
 	message-board.c.page		\
 	messagedialog.c.page		\
 	messagedialog.js.page		\
 	messagedialog.py.page		\
 	messagedialog.vala.page		\
-	model-view-controller.py.page		\
-	paned.py.page		\
+	model-view-controller.py.page	\
+	paned.py.page			\
 	photo-wall.c.page		\
 	progressbar.c.page		\
 	progressbar.js.page		\
@@ -409,9 +408,9 @@ DOC_PAGES =				\
 	toolbar.js.page			\
 	toolbar.py.page			\
 	toolbar.vala.page		\
-	toolbar_builder.py.page	\
+	toolbar_builder.py.page		\
 	toolbar_builder.vala.page	\
-	tooltip.py.page	\
+	tooltip.py.page			\
 	treeview_advanced_liststore.py.page	\
 	treeview_cellrenderertoggle.py.page	\
 	treeview_simple_liststore.js.page	\
@@ -419,7 +418,7 @@ DOC_PAGES =				\
 	treeview_simple_liststore.vala.page	\
 	treeview_treestore.py.page	\
 	translate.page			\
-	tutorial.py.page			\
+	tutorial.py.page		\
 	vala.page			\
 	weatherApp.js.page		\
 	weatherAppMain.js.page		\
@@ -429,5 +428,3 @@ DOC_PAGES =				\
 	window.js.page			\
 	window.py.page			\
 	window.vala.page
-
-dist-hook: doc-dist-hook
diff --git a/platform-overview/Makefile.am b/platform-overview/Makefile.am
index 4143b5d..125b7bc 100644
--- a/platform-overview/Makefile.am
+++ b/platform-overview/Makefile.am
@@ -1,8 +1,7 @@
-include $(top_srcdir)/gnome-doc-utils.make
-dist-hook: doc-dist-hook
+ YELP_HELP_RULES@
 
-DOC_ID = platform-overview
-DOC_PAGES =			\
+HELP_ID = platform-overview
+HELP_FILES =			\
 	atk.page		\
 	cairo.page		\
 	canberra.page		\
@@ -22,12 +21,8 @@ DOC_PAGES =			\
 	notify.page		\
 	pango.page		\
 	telepathy.page		\
-	webkit.page
-
-DOC_FIGURES =
-
-DOC_INCLUDES=			\
+	webkit.page		\
 	cc-by-sa-3-0.xml	\
 	legal-fdl.xml
 
-DOC_LINGUAS = ca cs de el es fr gl it ja oc pt_BR ru uk sl sv zh_CN
+HELP_LINGUAS = ca cs de el es fr gl it ja oc pt_BR ru uk sl sv zh_CN
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]