[nautilus-actions] Configure the source tree for gnome-doc-utils usage

[Pierre Wieser <pwieser src gnome org>]

commit 53d80393b7512050dcb6518fc91212ca67fc7be1
Author: Pierre Wieser <pwieser trychlos org>
Date:   Sun Aug 1 11:33:03 2010 +0200

    Configure the source tree for gnome-doc-utils usage

 .gitignore           |    1 +
 Makefile.am          |    5 ++++-
 configure.ac         |    5 +++--
 doc/Makefile.am      |    2 +-
 doc/nact/Makefile.am |   46 ++++++++++++++++++++++++++++++++++++++++++++++
 m4/.gitignore        |    1 +
 6 files changed, 56 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e1fcd7c..7bffac0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,6 +19,7 @@ config.status
 config.sub
 configure
 depcomp
+gnome-doc-utils.make
 install/
 install-sh
 intltool-extract.in
diff --git a/Makefile.am b/Makefile.am
index bfc0f27..74017da 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -29,7 +29,7 @@
 ACLOCAL_AMFLAGS = -I m4
 
 SUBDIRS = \
-	docs								\
+	doc									\
 	m4									\
 	icons								\
 	src									\
@@ -45,15 +45,18 @@ DISTCHECK_CONFIGURE_FLAGS = \
 # do not try to install schemas when making distcheck
 DISTCHECK_CONFIGURE_FLAGS += \
 	--disable-schemas-install			\
+	--disable-scrollkeeper				\
 	$(NULL)
 
 EXTRA_DIST = \
+	gnome-doc-utils.make				\
 	intltool-extract.in					\
 	intltool-merge.in					\
 	intltool-update.in					\
 	$(NULL)
 
 DISTCLEANFILES = \
+	gnome-doc-utils.make				\
 	intltool-extract					\
 	intltool-merge						\
 	intltool-update						\
diff --git a/configure.ac b/configure.ac
index 5368a13..444d4fd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -39,8 +39,8 @@ AC_CONFIG_HEADERS([src/config.h])
 AC_CONFIG_FILES([
 	Makefile
 	data/Makefile
-	docs/Makefile
-	docs/nact/Makefile
+	doc/Makefile
+	doc/nact/Makefile
 	m4/Makefile
 	icons/Makefile
 	icons/16x16/Makefile
@@ -84,6 +84,7 @@ AC_PROG_MAKE_SET
 
 # Gnome stuff
 GNOME_COMMON_INIT
+GNOME_DOC_INIT
 GNOME_MAINTAINER_MODE_DEFINES
 NA_GNOME_COMPILE_WARNINGS([error],[-ansi -Wno-overlength-strings -Wformat=2])
 AC_SUBST([AM_CPPFLAGS],["${AM_CPPFLAGS} ${DISABLE_DEPRECATED}"])
diff --git a/doc/Makefile.am b/doc/Makefile.am
index aedb8d3..0b363d8 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -26,7 +26,7 @@
 #   Pierre Wieser <pwieser trychlos org>
 #   ... and many others (see AUTHORS)
 
-subdirs = \
+SUBDIRS = \
 	nact								\
 	$(NULL)
 
diff --git a/doc/nact/Makefile.am b/doc/nact/Makefile.am
index 93cbc52..ecc5405 100644
--- a/doc/nact/Makefile.am
+++ b/doc/nact/Makefile.am
@@ -25,3 +25,49 @@
 #   Rodrigo Moya <rodrigo gnome-db org>
 #   Pierre Wieser <pwieser trychlos org>
 #   ... and many others (see AUTHORS)
+
+# from Migrating your documentation to gnome-doc-utils
+# http://live.gnome.org/GnomeDocUtilsMigrationHowTo
+
+include $(top_srcdir)/gnome-doc-utils.make
+
+dist-hook: doc-dist-hook
+
+DOC_MODULE = nautilus-actions-config-tool
+
+DOC_ENTITIES = \
+	$(NULL)
+
+DOC_INCLUDES = \
+	appendix-feedback.xml						\
+	appendix-gnu-fdl-1.3.xml					\
+	articleinfo.xml								\
+	legalnotice.xml								\
+	$(NULL)
+
+DOC_FIGURES = \
+	figures/nact-basenames-tab.png				\
+	figures/nact-capabilities-tab.png			\
+	figures/nact-command-tab.png				\
+	figures/nact-environment-tab.png			\
+	figures/nact-execution-tab.png				\
+	figures/nact-folders-tab.png				\
+	figures/nact-legend.png						\
+	figures/nact-main-empty.png					\
+	figures/nact-mimetypes-tab.png				\
+	figures/nact-new-capability.png				\
+	figures/nact-preferences-export.png			\
+	figures/nact-preferences-import.png			\
+	figures/nact-preferences-io-providers.png	\
+	figures/nact-preferences-runtime.png		\
+	figures/nact-preferences-schemes.png		\
+	figures/nact-preferences-ui.png				\
+	figures/nact-properties-tab.png				\
+	figures/nact-schemes-tab.png				\
+	$(NULL)
+
+clean-local :
+	rm -f *~
+
+DOC_LINGUAS = \
+	$(NULL)
diff --git a/m4/.gitignore b/m4/.gitignore
index 55eaa80..d7777cc 100644
--- a/m4/.gitignore
+++ b/m4/.gitignore
@@ -1,3 +1,4 @@
+gnome-doc-utils.m4
 intltool.m4
 libtool.m4
 ltoptions.m4