[cairo-commit] goocanvas ChangeLog, 1.10, 1.11 Makefile.am, 1.1.1.1, 1.2 autogen.sh, 1.1.1.1, 1.2 configure.in, 1.1.1.1, 1.2

[Damon Chaplin]

Committed by: damon

Update of /cvs/cairo/goocanvas
In directory kemper:/tmp/cvs-serv28871

Modified Files:
	ChangeLog Makefile.am autogen.sh configure.in 
Log Message:
2006-04-12  Damon Chaplin  <damon at gnome.org>

	* autogen.sh: 
	* configure.in: 
	* Makefile.am: setup to use gtk-doc.

	* src/Makefile.am: build libgoocanvas as a library now, so we can
	document it with gtk-doc. The demo will be moved to a separate
	directory.

	* src/goocanvastext.h: 
	* src/goocanvasitem.h: rename a few parameters to match the sources,
	since gtk-doc complains if they are different.



Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/goocanvas/ChangeLog,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- ChangeLog	11 Apr 2006 13:42:16 -0000	1.10
+++ ChangeLog	12 Apr 2006 10:42:20 -0000	1.11
@@ -1,3 +1,17 @@
+2006-04-12  Damon Chaplin  <damon at gnome.org>
+
+	* autogen.sh: 
+	* configure.in: 
+	* Makefile.am: setup to use gtk-doc.
+
+	* src/Makefile.am: build libgoocanvas as a library now, so we can
+	document it with gtk-doc. The demo will be moved to a separate
+	directory.
+
+	* src/goocanvastext.h: 
+	* src/goocanvasitem.h: rename a few parameters to match the sources,
+	since gtk-doc complains if they are different.
+
 2006-04-11  Damon Chaplin  <damon at gnome.org>
 
 	* src/demo-paths.c (create_paths): added more arc tests.

Index: Makefile.am
===================================================================
RCS file: /cvs/cairo/goocanvas/Makefile.am,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- Makefile.am	15 Dec 2005 15:32:00 -0000	1.1.1.1
+++ Makefile.am	12 Apr 2006 10:42:20 -0000	1.2
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = src po
+SUBDIRS = src demo docs po
 
 EXTRA_DIST = \
 	autogen.sh

Index: autogen.sh
===================================================================
RCS file: /cvs/cairo/goocanvas/autogen.sh,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- autogen.sh	15 Dec 2005 15:32:00 -0000	1.1.1.1
+++ autogen.sh	12 Apr 2006 10:42:20 -0000	1.2
@@ -20,6 +20,8 @@
     exit 1
 }
 
+gtkdocize || exit 1
+
 (autoconf --version) < /dev/null > /dev/null 2>&1 || {
   echo
   echo "**Error**: You must have \`autoconf' installed."

Index: configure.in
===================================================================
RCS file: /cvs/cairo/goocanvas/configure.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- configure.in	15 Dec 2005 15:32:00 -0000	1.1.1.1
+++ configure.in	12 Apr 2006 10:42:20 -0000	1.2
@@ -9,6 +9,7 @@
 AC_PROG_CC
 AM_PROG_CC_STDC
 AC_HEADER_STDC
+AM_PROG_LIBTOOL
 
 pkg_modules="gtk+-2.0 >= 2.8.0"
 PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
@@ -26,9 +27,13 @@
 AC_ARG_VAR(GLIB_GENMARSHAL, [The glib-genmarshal executable.])
 AC_CHECK_PROG(GLIB_GENMARSHAL, glib-genmarshal, glib-genmarshal)
 
+GTK_DOC_CHECK(1.4)
+
 AC_OUTPUT([
 Makefile
 src/Makefile
+demo/Makefile
+docs/Makefile
 po/Makefile.in
 ])