Fix doc build

4 files changed, 68 insertions, 56 deletions

diff --git a/docs/reference/gdk-pixbuf/Makefile.am b/docs/reference/gdk-pixbuf/Makefile.am
index e4d0a815b..22f9a3c8f 100644
--- a/docs/reference/gdk-pixbuf/Makefile.am
+++ b/docs/reference/gdk-pixbuf/Makefile.am
@@ -31,15 +31,15 @@ IGNORE_HFILES=				\
 	xpm-color-table.h		\
 	test-images.h
 
-INCLUDES = 			\
-	-I$(top_srcdir) 	\
-	-I$(top_builddir) 	\
-	$(GTK_DEBUG_FLAGS)	\
-	$(GTK_DEP_CFLAGS)
+INCLUDES = 				\
+	-I$(top_srcdir) 		\
+	-I$(top_builddir) 		\
+	$(GDK_PIXBUF_DEBUG_FLAGS)	\
+	$(GDK_PIXBUF_DEP_CFLAGS)
 
 GTKDOC_LIBS = \
 	$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GDK_PIXBUF_API_VERSION).la \
-	$(GTK_DEP_LIBS)
+	$(GDK_PIXBUF_DEP_LIBS)
 
 
 # Extra options to supply to gtkdoc-mkdb
@@ -51,8 +51,7 @@ content_files =				\
 	gdk-pixbuf-from-drawables.sgml	\
 	gdk-pixbuf-rendering.sgml	\
 	gdk-pixbuf.sgml			\
-	porting-from-imlib.sgml		\
-	gdk-pixbuf-csource-3.0.xml	\
+	gdk-pixbuf-csource-2.0.xml	\
 	gdk-pixbuf-query-loaders-2.0.xml
 
 # Images to copy into HTML directory
diff --git a/docs/reference/gdk-pixbuf/gdk-pixbuf-from-drawables.sgml b/docs/reference/gdk-pixbuf/gdk-pixbuf-from-drawables.sgml
new file mode 100644
index 000000000..2d9f43ae5
--- /dev/null
+++ b/docs/reference/gdk-pixbuf/gdk-pixbuf-from-drawables.sgml
@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+<refentry id="gdk-pixbuf-gdk-pixbuf-from-drawables">
+<refmeta>
+<refentrytitle>Drawables to Pixbufs</refentrytitle>
+<manvolnum>3</manvolnum>
+<refmiscinfo>GDK-PIXBUF Library</refmiscinfo>
+</refmeta>
+
+<refnamediv>
+<refname>Drawables to Pixbufs</refname><refpurpose>Getting parts of a GDK drawable's image data into a pixbuf.</refpurpose>
+</refnamediv>
+
+<refsect1>
+<title>Description</title>
+  <para>
+    The functions to take the image data from a GDK drawable and dump it 
+    into a pixbuf are contained in GDK, see the 
+    <link linkend="gdk-Pixbufs">Pixbufs</link> section of the GDK 
+    documentation.
+  </para>
+</refsect1>
+
+
+
+
+</refentry>
diff --git a/docs/reference/gdk-pixbuf/gdk-pixbuf-rendering.sgml b/docs/reference/gdk-pixbuf/gdk-pixbuf-rendering.sgml
new file mode 100644
index 000000000..336004c86
--- /dev/null
+++ b/docs/reference/gdk-pixbuf/gdk-pixbuf-rendering.sgml
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+]>
+<refentry id="gdk-pixbuf-gdk-pixbuf-rendering">
+<refmeta>
+<refentrytitle>Rendering</refentrytitle>
+<manvolnum>3</manvolnum>
+<refmiscinfo>GDK-PIXBUF Library</refmiscinfo>
+</refmeta>
+
+<refnamediv>
+<refname>Rendering</refname><refpurpose>Rendering a pixbuf to a GDK drawable.</refpurpose>
+</refnamediv>
+
+
+<refsect1>
+<title>Description</title>
+  <para>
+    The functions to render pixbufs to GDK drawables are contained in 
+    GDK, see the <link linkend="gdk-Pixbufs">Pixbufs</link> section 
+    of the GDK documentation.
+  </para>
+</refsect1>
+
+
+
+
+</refentry>
+
+
+
diff --git a/docs/reference/gdk-pixbuf/gdk-pixbuf-sections.txt b/docs/reference/gdk-pixbuf/gdk-pixbuf-sections.txt
index 61792baac..2cee94902 100644
--- a/docs/reference/gdk-pixbuf/gdk-pixbuf-sections.txt
+++ b/docs/reference/gdk-pixbuf/gdk-pixbuf-sections.txt
@@ -248,51 +248,3 @@ GDK_IS_PIXBUF_ANIMATION_CLASS
 GDK_PIXBUF_ANIMATION_ITER_GET_CLASS
 GDK_PIXBUF_ANIMATION_CLASS
 </SECTION>
-
-<SECTION>
-<FILE>gdk-pixbuf-xlib-init</FILE>
-gdk_pixbuf_xlib_init
-gdk_pixbuf_xlib_init_with_depth
-</SECTION>
-
-<SECTION>
-<FILE>gdk-pixbuf-xlib-rendering</FILE>
-gdk_pixbuf_xlib_render_threshold_alpha
-gdk_pixbuf_xlib_render_to_drawable
-gdk_pixbuf_xlib_render_to_drawable_alpha
-gdk_pixbuf_xlib_render_pixmap_and_mask
-</SECTION>
-
-<SECTION>
-<FILE>gdk-pixbuf-xlib-from-drawables</FILE>
-gdk_pixbuf_xlib_get_from_drawable
-</SECTION>
-
-<SECTION>
-<FILE>gdk-pixbuf-xlib-rgb</FILE>
-XlibRgbCmap
-XlibRgbDither
-xlib_rgb_init
-xlib_rgb_init_with_depth
-xlib_rgb_xpixel_from_rgb
-xlib_rgb_gc_set_foreground
-xlib_rgb_gc_set_background
-xlib_draw_rgb_image
-xlib_draw_rgb_image_dithalign
-xlib_draw_rgb_32_image
-xlib_draw_gray_image
-xlib_rgb_cmap_new
-xlib_rgb_cmap_free
-xlib_draw_indexed_image
-xlib_rgb_ditherable
-xlib_rgb_set_verbose
-xlib_rgb_set_install
-xlib_rgb_set_min_colors
-xlib_rgb_get_cmap
-xlib_rgb_get_visual
-xlib_rgb_get_visual_info
-xlib_rgb_get_depth
-xlib_rgb_get_display
-xlib_rgb_get_screen
-</SECTION>
-