switch to gnome-doc-utils, require 1.9 to build the tarball correctly

12 files changed, 53 insertions, 46 deletions

diff --git a/.cvsignore b/.cvsignore
index 37f6a0f34..1768b67f5 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -13,6 +13,7 @@ config.status
 config.sub
 configure
 configure.scan
+gnome-doc-utils.make
 intl
 libtool
 ltconfig
diff --git a/ChangeLog b/ChangeLog
index b3b87cd8a..677615c8c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
 2005-07-27  Sebastien Bacher  <seb128@debian.org>
 
+	* .cvsignore:
+	* Makefile.am:
+	* autogen.sh:
+	* configure.in:
+	* m4/.cvsignore:
+	switch to gnome-doc-utils. require automake-1.9 and use "tar-ustar" to
+	fix the make dist.
+
+2005-07-27  Sebastien Bacher  <seb128@debian.org>
+
 	* NEWS:
 	* configure.in: updated for 2.11.90.
 
diff --git a/Makefile.am b/Makefile.am
index dc27afed5..36fcebbbb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = po libsounds libbackground libwindow-settings libgswitchit libkbdraw gnome-settings-daemon capplets control-center vfs-methods idl schemas $(TYPING_BREAK)
+SUBDIRS = po libsounds libbackground libwindow-settings libgswitchit libkbdraw gnome-settings-daemon capplets control-center help vfs-methods idl schemas $(TYPING_BREAK)
 
 #I removed the root-manager for now
 #
@@ -14,10 +14,14 @@ dist-hook: control-center.spec
 DISTCLEANFILES = \
   intltool-extract \
   intltool-merge \
-  intltool-update
+  intltool-update \
+  gnome-doc-utils.make
 
 EXTRA_DIST = \
 	control-center.spec.in	\
 	intltool-extract.in \
 	intltool-merge.in \
-	intltool-update.in
+	intltool-update.in \
+	gnome-doc-utils.make
+
+DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper
diff --git a/autogen.sh b/autogen.sh
index 4dad4ef1d..fb4ed67be 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -24,4 +24,4 @@ if ! which gnome-autogen.sh ; then
   exit 1
 fi
 
-REQUIRED_AUTOMAKE_VERSION=1.7 . gnome-autogen.sh
+REQUIRED_AUTOMAKE_VERSION=1.9 . gnome-autogen.sh
diff --git a/configure.in b/configure.in
index dce2e25ef..8d2bac491 100644
--- a/configure.in
+++ b/configure.in
@@ -1,10 +1,11 @@
 AC_INIT([control-center], [2.11.90],
         [http://bugzilla.gnome.org/enter_bug.cgi?product=control-center])
 
+AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_SRCDIR([control-center])
 AC_CONFIG_HEADERS([config.h])
 
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE([1.9 tar-ustar])
 AM_MAINTAINER_MODE
 
 AC_SUBST([ACLOCAL_AMFLAGS], ["\${ACLOCAL_FLAGS}"])
@@ -17,6 +18,9 @@ AC_PROG_CC
 AC_STDC_HEADERS
 AM_PROG_LIBTOOL
 
+# Use the GNOME documentation framework
+GNOME_DOC_INIT
+
 m4_define(gnomevfs_minver, 2.0.0)
 m4_define(fontconfig_minver, 1.0.0)
 m4_define(xft_minver, 2.1.7)
@@ -548,6 +552,7 @@ capplets/accessibility/at-properties/Makefile
 capplets/network/Makefile
 capplets/windows/Makefile
 capplets/about-me/Makefile
+help/Makefile
 typing-break/Makefile
 schemas/Makefile
 libsounds/Makefile
diff --git a/help/.cvsignore b/help/.cvsignore
index 3dda72986..83e56ef01 100644
--- a/help/.cvsignore
+++ b/help/.cvsignore
@@ -1,2 +1,3 @@
 Makefile.in
 Makefile
+*.omf
diff --git a/help/C/Makefile.am b/help/C/Makefile.am
deleted file mode 100644
index 7cb9aab54..000000000
--- a/help/C/Makefile.am
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# Disabled : The control center docs are in the gnome-user-guide module
-#
-#figs = 
-#docname = control-center-manual
-#lang = C
-#omffile = control-center-C.omf
-#entities = config-background.xml \
-#	   config-behavior.xml \
-#	   config-cds.xml \
-#           config-hints.xml \
-#           config-html.xml \
-#           config-kbd.xml \
-#           config-keybindings.xml \
-#           config-mouse.xml \
-#           config-screensaver.xml \
-#           config-sound.xml \
-#           config-themes.xml \
-#	   config-file-type.xml \
-#	   config-accessibility-keyboard.xml \
-#	   config-default-apps.xml \
-#	   control-center.xml
-#
-#include $(top_srcdir)/help/xmldocs.make
-#dist-hook: app-dist-hook
diff --git a/help/C/control-center-C.omf b/help/C/control-center-C.omf
deleted file mode 100644
index a80ce4906..000000000
--- a/help/C/control-center-C.omf
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<omf>
-  <resource>
-    <title>
-      Control Center Manual
-    </title>
-    <subject>
-      <category>GNOME|Utilities</category>
-    </subject>
-    <format mime="text/html" />
-    <identifier url="index.html" />
-    <language code="C" />
-  </resource>
-</omf>
diff --git a/help/ChangeLog b/help/ChangeLog
index 6abf5bb5f..8ef34f821 100644
--- a/help/ChangeLog
+++ b/help/ChangeLog
@@ -1,3 +1,12 @@
+2005-07-27  Sebastien Bacher  <seb128@debian.org>
+
+	* .cvsignore:
+	* C/Makefile.am:
+	* C/control-center-C.omf:
+	* Makefile.am:
+	* control-center.omf.in:
+	switch to gnome-doc-utils.
+
 2005-07-20  Rodrigo Moya <rodrigo@novell.com>
 
 	* C/config-screensaver.xml: specify the fact that it works with both
diff --git a/help/Makefile.am b/help/Makefile.am
index 245e39bd0..16555292c 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -1,2 +1,8 @@
-# Disabled the docs are in gnome-user-guide
-# SUBDIRS = C
+include $(top_srcdir)/gnome-doc-utils.make
+dist-hook: doc-dist-hook
+
+DOC_MODULE = control-center
+DOC_ENTITIES = config-accessibility-keyboard.xml config-background.xml config-behavior.xml config-cds.xml config-default-apps.xml config-file-type.xml config-hints.xml config-html.xml config-kbd.xml config-keybindings.xml config-mouse.xml config-screensaver.xml config-sound.xml config-themes.xml
+DOC_INCLUDES = 
+
+DOC_LINGUAS =
diff --git a/help/control-center.omf.in b/help/control-center.omf.in
new file mode 100644
index 000000000..d3849fa30
--- /dev/null
+++ b/help/control-center.omf.in
@@ -0,0 +1,9 @@
+<?xml version="1.0" standalone="no"?>
+<omf>
+  <resource>
+    <subject category="GNOME|Utilities"/>
+    <type>user's guide</type>	
+    <relation seriesid="e9bfb3ba-fe90-11d9-9eb2-8beabbd95e64"/>
+    <rights type="GNU FDL" license.version="1.1" holder="Ximian, Inc."/>
+  </resource>
+</omf>
diff --git a/m4/.cvsignore b/m4/.cvsignore
new file mode 100644
index 000000000..3492dc4ef
--- /dev/null
+++ b/m4/.cvsignore
@@ -0,0 +1 @@
+gnome-doc-utils.m4