gtk-doc r553 - in trunk: . help/manual help/manual/C m4

[malureau svn gnome org]

Author: malureau
Date: Sat Mar 22 16:00:15 2008
New Revision: 553
URL: http://svn.gnome.org/viewvc/gtk-doc?rev=553&view=rev

Log:
2008-03-21  Marc-Andre Lureau <marcandre lureau gmail com>

	* .svnignore, Makefile.am, autogen.sh, configure.in,
	help/manual/.svnignore, help/manual/C/ChangeLog,
	help/manual/C/Makefile.am, help/manual/C/gtk-doc-manual-C.omf.in,
	help/manual/C/gtk-doc-manual.xml, help/manual/ChangeLog,
	help/manual/Makefile.am, help/manual/gtk-doc-manual.omf.in,
	m4/.svnignore, omf.make, xmldocs.make:
	GNOME doc-utils migration.  (Closes #335239)


Added:
   trunk/.svnignore
   trunk/help/manual/.svnignore
   trunk/help/manual/ChangeLog
      - copied, changed from r552, /trunk/help/manual/C/ChangeLog
   trunk/help/manual/gtk-doc-manual.omf.in
   trunk/m4/
   trunk/m4/.svnignore
Removed:
   trunk/help/manual/C/ChangeLog
   trunk/help/manual/C/Makefile.am
   trunk/help/manual/C/gtk-doc-manual-C.omf.in
   trunk/omf.make
   trunk/xmldocs.make
Modified:
   trunk/ChangeLog
   trunk/Makefile.am
   trunk/autogen.sh
   trunk/configure.in
   trunk/help/manual/C/gtk-doc-manual.xml
   trunk/help/manual/Makefile.am

Added: trunk/.svnignore
==============================================================================
--- (empty file)
+++ trunk/.svnignore	Sat Mar 22 16:00:15 2008
@@ -0,0 +1,26 @@
+Makefile
+Makefile.in
+aclocal.m4
+autom4te.cache
+autoregen.sh
+config.cache
+config.h.in
+config.log
+config.status
+configure
+gtk-doc-*.tar.gz
+gtk-doc.cat
+gtk-doc.dsl
+gtk-doc.pc
+gtk-doc.spec
+gtkdoc-common.pl
+gtkdoc-fixxref
+gtkdoc-mkdb
+gtkdoc-mkhtml
+gtkdoc-mkman
+gtkdoc-mktmpl
+gtkdoc-scan
+gtkdoc-scangobj
+gtkdoc-scanobj
+gtkdocize
+gnome-doc-utils.make

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Sat Mar 22 16:00:15 2008
@@ -79,5 +79,8 @@
   tools/gtk-doc.el \
   style.css \
   COPYING-DOCS \
-  omf.make \
-  xmldocs.make
+  gnome-doc-utils.make \
+  m4
+
+DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper
+DISTCLEANFILES = gnome-doc-utils.make
\ No newline at end of file

Modified: trunk/autogen.sh
==============================================================================
--- trunk/autogen.sh	(original)
+++ trunk/autogen.sh	Sat Mar 22 16:00:15 2008
@@ -19,6 +19,12 @@
 
 cd "$srcdir"
 
+which gnome-doc-prepare || {
+    echo "You need to install gnome-doc-utils to build this package"
+    exit 1
+}
+gnome-doc-prepare
+
 (autoconf --version) < /dev/null > /dev/null 2>&1 || {
 	echo
 	echo "You must have autoconf installed to compile $PROJECT."
@@ -64,14 +70,18 @@
         echo "to pass any to it, please specify them on the $0 command line."
 fi
 
+echo "* Running $ACLOCAL"
 $ACLOCAL $ACLOCAL_FLAGS || exit $?
 
+echo "* Running autoconf"
 autoconf || exit $?
 # optionally feature autoheader
 #(autoheader --version)  < /dev/null > /dev/null 2>&1 && autoheader
 
+echo "* Running libtoolize"
 libtoolize --copy --force
 
+echo "* Running $AUTOMAKE"
 $AUTOMAKE --add-missing $am_opt || exit $?
 
 cd "$THEDIR"

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Sat Mar 22 16:00:15 2008
@@ -8,11 +8,14 @@
 AC_INIT([gtk-doc], [gtk_doc_version],
         [http://bugzilla.gnome.org/enter_bug.cgi?product=gtk-doc])
 
+AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_SRCDIR([gtk-doc.dsl.in])
 
 AM_INIT_AUTOMAKE
 AM_MAINTAINER_MODE
 
+GNOME_DOC_INIT
+
 # make sure $ACLOCAL_FLAGS are used during a rebuild.
 AC_SUBST([ACLOCAL_AMFLAGS], ["\${ACLOCAL_FLAGS}"])
 
@@ -111,9 +114,6 @@
 #    AC_MSG_WARN([Couldn't find xsltproc, please install the libxml/libxslt package])
 #  fi
 fi
-AM_CONDITIONAL(ENABLE_SCROLLKEEPER, test ! x$scrollkeeper_config = xno)
-SCROLLKEEPER_BUILD_REQUIRED=0.3.5
-AC_SUBST(SCROLLKEEPER_BUILD_REQUIRED)
 
 # if glib is available we can enable the tests
 PKG_CHECK_MODULES(TEST_DEPS, [glib-2.0 >= 2.6.0 gobject-2.0 >= 2.6.0], [
@@ -139,8 +139,6 @@
 gtkdoc-common.pl
 help/Makefile
 help/manual/Makefile
-help/manual/C/Makefile
-help/manual/C/gtk-doc-manual-C.omf
 tests/Makefile
 tests/gobject/Makefile
 tests/gobject/src/Makefile

Added: trunk/help/manual/.svnignore
==============================================================================
--- (empty file)
+++ trunk/help/manual/.svnignore	Sat Mar 22 16:00:15 2008
@@ -0,0 +1,4 @@
+Makefile.in
+Makefile
+*.omf
+

Modified: trunk/help/manual/C/gtk-doc-manual.xml
==============================================================================
--- trunk/help/manual/C/gtk-doc-manual.xml	(original)
+++ trunk/help/manual/C/gtk-doc-manual.xml	Sat Mar 22 16:00:15 2008
@@ -11,6 +11,7 @@
   <bookinfo>
     <title>GTK-Doc Manual</title>
     <edition>1.11</edition>
+    <abstract role="description"><para>User manual for developers with instructions of GTK-Doc usage.</para></abstract>
     <authorgroup>
       <author>
         <firstname>Chris</firstname>
@@ -40,6 +41,7 @@
         </affiliation>
       </author>
     </authorgroup>
+    <publisher role="maintainer"><address><email>gtk-doc-list gnome org</email></address></publisher>
     <copyright>
       <year>2000, 2005, 2007-2008</year>
       <holder>Dan Mueth and Chris Lyttle and Stefan Kost</holder>
@@ -69,6 +71,15 @@
         or initial caps.
       </para>
     </legalnotice>
+    
+    <revhistory>
+      <revision>
+	<revnumber>1.11</revnumber>
+	<date>22 March 2008</date>
+	<authorinitials>mal</authorinitials>
+	<revremark>GNOME doc-utils migration</revremark>
+      </revision>
+    </revhistory>
 
   </bookinfo>
 
@@ -1269,7 +1280,7 @@
     <tip>
       <para>
         Enable or add the <option>TESTS=($GTKDOC_CHECK)</option> line in Makefile.am.
-        If at least gtk-doc 1.9 is installed, this will run sanity checks during 
+        If at least gtk-doc 1.9 is installed, this will run sanity checks during
         make check run.
       </para>
     </tip>

Modified: trunk/help/manual/Makefile.am
==============================================================================
--- trunk/help/manual/Makefile.am	(original)
+++ trunk/help/manual/Makefile.am	Sat Mar 22 16:00:15 2008
@@ -1,3 +1,7 @@
-## Process this file with automake to produce Makefile.in
-
-SUBDIRS = C
+include $(top_srcdir)/gnome-doc-utils.make
+dist-hook: doc-dist-hook
+DOC_MODULE = gtk-doc-manual
+DOC_ENTITIES = fdl-appendix.xml
+DOC_INCLUDES =
+DOC_FIGURES =
+DOC_LINGUAS =
\ No newline at end of file

Added: trunk/help/manual/gtk-doc-manual.omf.in
==============================================================================
--- (empty file)
+++ trunk/help/manual/gtk-doc-manual.omf.in	Sat Mar 22 16:00:15 2008
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<omf>
+  <resource>
+    <subject category="GNOME|Development"/>
+    <type>manual</type>
+    <relation seriesid="04ecd20e-775e-11d9-81af-a7c5a5fa91f6"/>
+    <rights type="GNU FDL" license.version="1.1" holder="gtk-doc developer team"/>
+  </resource>
+</omf>
+
+
+
+
+
+

Added: trunk/m4/.svnignore
==============================================================================
--- (empty file)
+++ trunk/m4/.svnignore	Sat Mar 22 16:00:15 2008
@@ -0,0 +1 @@
+gnome-doc-utils.m4
\ No newline at end of file