Don't add a -2.0 suffix to binaries any longer

We no longer need to make them parallel installable

8 files changed, 41 insertions, 29 deletions

diff --git a/docs/reference/gdk-pixbuf/Makefile.am b/docs/reference/gdk-pixbuf/Makefile.am
index 22f9a3c8f..20ce387c2 100644
--- a/docs/reference/gdk-pixbuf/Makefile.am
+++ b/docs/reference/gdk-pixbuf/Makefile.am
@@ -7,17 +7,19 @@ AUTOMAKE_OPTIONS = 1.6
 DOC_MODULE=gdk-pixbuf
 
 # The top-level SGML file.
-DOC_MAIN_SGML_FILE=gdk-pixbuf.sgml
+DOC_MAIN_SGML_FILE=gdk-pixbuf.xml
 
 # Extra options to supply to gtkdoc-scan
-SCAN_OPTIONS=--deprecated-guards="GDK_PIXBUF_ENABLE_BROKEN|GDK_PIXBUF_DISABLE_DEPRECATED"
+SCAN_OPTIONS= \
+	--source-dir=../../../contrib/gdk-pixbuf-xlib \
+	--deprecated-guards="GDK_PIXBUF_ENABLE_BROKEN|GDK_PIXBUF_DISABLE_DEPRECATED"
 
 # The directory containing the source code. Relative to $(srcdir)
 DOC_SOURCE_DIR=../../../gdk-pixbuf
 
 # Used for dependencies
-HFILE_GLOB=$(top_srcdir)/gdk-pixbuf/*.h
-CFILE_GLOB=$(top_srcdir)/gdk-pixbuf/*.c
+HFILE_GLOB=$(top_srcdir)/gdk-pixbuf/*.h $(top_srcdir)/contrib/gdk-pixbuf-xlib/*.h
+CFILE_GLOB=$(top_srcdir)/gdk-pixbuf/*.c $(top_srcdir)/contrib/gdk-pixbuf-xlib/*.c
 
 # Header files to ignore when scanning
 IGNORE_HFILES=				\
@@ -26,6 +28,7 @@ IGNORE_HFILES=				\
 	gdk-pixbuf-marshal.h		\
 	gdk-pixbuf-i18n.h 		\
 	gdk-pixbuf-private.h		\
+	gdk-pixbuf-xlib-private.h	\
 	io-gif-animation.h		\
 	io-ani-animation.h		\
 	xpm-color-table.h		\
@@ -43,16 +46,21 @@ GTKDOC_LIBS = \
 
 
 # Extra options to supply to gtkdoc-mkdb
-MKDB_OPTIONS=--main-sgml-file=$(DOC_MAIN_SGML_FILE) --sgml-mode --output-format=xml --name-space=gdk_pixbuf
+MKDB_OPTIONS= \
+	--main-sgml-file=$(DOC_MAIN_SGML_FILE) 	\
+	--sgml-mode 				\
+	--source-dir=../../../contrib/gdk-pixbuf-xlib \
+	--output-format=xml 			\
+	--name-space=gdk_pixbuf
 
 # Extra SGML files that are included by DOC_MAIN_SGML_FILE
 content_files =				\
 	version.xml			\
-	gdk-pixbuf-from-drawables.sgml	\
-	gdk-pixbuf-rendering.sgml	\
-	gdk-pixbuf.sgml			\
-	gdk-pixbuf-csource-2.0.xml	\
-	gdk-pixbuf-query-loaders-2.0.xml
+	gdk-pixbuf-from-drawables.xml	\
+	gdk-pixbuf-rendering.xml	\
+	gdk-pixbuf.xml			\
+	gdk-pixbuf-csource.xml		\
+	gdk-pixbuf-query-loaders.xml
 
 # Images to copy into HTML directory
 HTML_IMAGES = composite.png
@@ -75,8 +83,8 @@ EXTRA_DIST += version.xml.in \
 ########################################################################
 
 man_MANS = 				\
-	gdk-pixbuf-csource-2.0.1	\
-	gdk-pixbuf-query-loaders-2.0.1
+	gdk-pixbuf-csource.1		\
+	gdk-pixbuf-query-loaders.1
 
 if ENABLE_MAN
 
diff --git a/docs/reference/gdk-pixbuf/gdk-pixbuf-csource-2.0.xml b/docs/reference/gdk-pixbuf/gdk-pixbuf-csource.xml
index b1d16043f..a88d506d9 100644
--- a/docs/reference/gdk-pixbuf/gdk-pixbuf-csource-2.0.xml
+++ b/docs/reference/gdk-pixbuf/gdk-pixbuf-csource.xml
@@ -5,23 +5,23 @@
 <refentry id="gdk-pixbuf-csource">
 
 <refmeta>
-<refentrytitle>gdk-pixbuf-csource-2.0</refentrytitle>
+<refentrytitle>gdk-pixbuf-csource</refentrytitle>
 <manvolnum>1</manvolnum>
 </refmeta>
 
 <refnamediv>
-<refname>gdk-pixbuf-csource-2.0</refname>
+<refname>gdk-pixbuf-csource</refname>
 <refpurpose>C code generation utility for GdkPixbuf images</refpurpose>
 </refnamediv>
 
 <refsynopsisdiv>
 <cmdsynopsis>
-<command>gdk-pixbuf-csource-2.0</command>
+<command>gdk-pixbuf-csource</command>
 <arg choice="opt">options</arg>
 <arg choice="opt">image</arg>
 </cmdsynopsis>
 <cmdsynopsis>
-<command>gdk-pixbuf-csource-2.0</command>
+<command>gdk-pixbuf-csource</command>
 <arg choice="opt">options</arg>
 <arg choice="plain">--build-list</arg>
 <arg rep="repeat">
@@ -33,14 +33,14 @@
 
 <refsect1><title>Description</title>
 <para>
-<command>gdk-pixbuf-csource-2.0</command> is a small utility that generates
+<command>gdk-pixbuf-csource</command> is a small utility that generates
 C code containing images, useful for compiling images directly into programs.
 </para>
 </refsect1>
 
 <refsect1><title>Invocation</title>
 <para>
-<command>gdk-pixbuf-csource-2.0</command> either takes as input one image file
+<command>gdk-pixbuf-csource</command> either takes as input one image file
 name to generate code for, or, using the <option>--build-list</option> option,
 a list of (<replaceable>name</replaceable>, <replaceable>image</replaceable>)
 pairs to generate code for a list of images into named variables.
@@ -166,7 +166,7 @@ generates pixbufs with suboptimal rowstride in some cases.
 
 <refsect1><title>Author</title>
 <para>
-<command>gdk-pixbuf-csource-2.0</command> was written by Tim Janik
+<command>gdk-pixbuf-csource</command> was written by Tim Janik
 <email>timj@gtk.org</email>.
 </para>
 <para>
diff --git a/docs/reference/gdk-pixbuf/gdk-pixbuf-from-drawables.sgml b/docs/reference/gdk-pixbuf/gdk-pixbuf-from-drawables.xml
index 2d9f43ae5..2d9f43ae5 100644
--- a/docs/reference/gdk-pixbuf/gdk-pixbuf-from-drawables.sgml
+++ b/docs/reference/gdk-pixbuf/gdk-pixbuf-from-drawables.xml
diff --git a/docs/reference/gdk-pixbuf/gdk-pixbuf-query-loaders-2.0.xml b/docs/reference/gdk-pixbuf/gdk-pixbuf-query-loaders.xml
index d0062d359..4f51a0408 100644
--- a/docs/reference/gdk-pixbuf/gdk-pixbuf-query-loaders-2.0.xml
+++ b/docs/reference/gdk-pixbuf/gdk-pixbuf-query-loaders.xml
@@ -5,18 +5,18 @@
 <refentry id="gdk-pixbuf-query-loaders">
 
 <refmeta>
-<refentrytitle>gdk-pixbuf-query-loaders-2.0</refentrytitle>
+<refentrytitle>gdk-pixbuf-query-loaders</refentrytitle>
 <manvolnum>1</manvolnum>
 </refmeta>
 
 <refnamediv>
-<refname>gdk-pixbuf-query-loaders-2.0</refname>
+<refname>gdk-pixbuf-query-loaders</refname>
 <refpurpose>GdkPixbuf loader registration utility</refpurpose>
 </refnamediv>
 
 <refsynopsisdiv>
 <cmdsynopsis>
-<command>gdk-pixbuf-query-loaders-2.0</command>
+<command>gdk-pixbuf-query-loaders</command>
 <arg choice="opt">--update-cache</arg>
 <arg choice="opt" rep="repeat">module</arg>
 </cmdsynopsis>
@@ -24,7 +24,7 @@
 
 <refsect1><title>Description</title>
 <para>
-<command>gdk-pixbuf-query-loaders-2.0</command> collects information about
+<command>gdk-pixbuf-query-loaders</command> collects information about
 loadable modules for <application>gdk-pixbuf</application> and writes it to
 the default cache file location, or to <filename>stdout</filename>.
 </para>
@@ -37,7 +37,7 @@ If called with arguments, it looks for the specified modules. The arguments
 may be absolute or relative paths.
 </para>
 <para>
-Normally, the output of <command>gdk-pixbuf-queryloaders-2.0</command> is written
+Normally, the output of <command>gdk-pixbuf-queryloaders</command> is written
 to <filename><replaceable>libdir</replaceable>gdk-pixbuf-2.0/2.10.0/loaders.cache</filename>, where <application>gdk-pixbuf</application> looks for it by default. If it is written to some other
 location, the environment variable <link linkend="GDK_PIXBUF_MODULE_FILE"><envar>GDK_PIXBUF_MODULE_FILE</envar></link>
 can be set to point <application>gdk-pixbuf</application> at the file.
diff --git a/docs/reference/gdk-pixbuf/gdk-pixbuf-rendering.sgml b/docs/reference/gdk-pixbuf/gdk-pixbuf-rendering.xml
index 336004c86..336004c86 100644
--- a/docs/reference/gdk-pixbuf/gdk-pixbuf-rendering.sgml
+++ b/docs/reference/gdk-pixbuf/gdk-pixbuf-rendering.xml
diff --git a/docs/reference/gdk-pixbuf/gdk-pixbuf-sections.txt b/docs/reference/gdk-pixbuf/gdk-pixbuf-sections.txt
index 61792baac..8e70fa352 100644
--- a/docs/reference/gdk-pixbuf/gdk-pixbuf-sections.txt
+++ b/docs/reference/gdk-pixbuf/gdk-pixbuf-sections.txt
@@ -217,6 +217,8 @@ gdk_pixbuf_loader_get_type
 <FILE>module_interface</FILE>
 gdk_pixbuf_set_option
 gdk_pixbuf_get_formats
+gdk_pixbuf_format_copy
+gdk_pixbuf_format_free
 gdk_pixbuf_format_get_name
 gdk_pixbuf_format_get_description
 gdk_pixbuf_format_get_mime_types
@@ -247,6 +249,9 @@ GDK_PIXBUF_ANIMATION_ITER_CLASS
 GDK_IS_PIXBUF_ANIMATION_CLASS
 GDK_PIXBUF_ANIMATION_ITER_GET_CLASS
 GDK_PIXBUF_ANIMATION_CLASS
+
+<SUBSECTION Private>
+gdk_pixbuf_format_get_type
 </SECTION>
 
 <SECTION>
diff --git a/docs/reference/gdk-pixbuf/gdk-pixbuf.types b/docs/reference/gdk-pixbuf/gdk-pixbuf.types
index 6169c7b36..d49e973c4 100644
--- a/docs/reference/gdk-pixbuf/gdk-pixbuf.types
+++ b/docs/reference/gdk-pixbuf/gdk-pixbuf.types
@@ -5,4 +5,3 @@ gdk_pixbuf_loader_get_type
 gdk_pixbuf_animation_get_type
 gdk_pixbuf_animation_iter_get_type
 gdk_pixbuf_simple_anim_get_type
-
diff --git a/docs/reference/gdk-pixbuf/gdk-pixbuf.sgml b/docs/reference/gdk-pixbuf/gdk-pixbuf.xml
index 0ca682e96..43a458c03 100644
--- a/docs/reference/gdk-pixbuf/gdk-pixbuf.sgml
+++ b/docs/reference/gdk-pixbuf/gdk-pixbuf.xml
@@ -84,8 +84,8 @@
     <xi:include href="xml/creating.xml" />
     <xi:include href="xml/inline.xml" />
     <xi:include href="xml/scaling.xml" />
-    <xi:include href="gdk-pixbuf-rendering.sgml" />
-    <xi:include href="gdk-pixbuf-from-drawables.sgml" />
+    <xi:include href="gdk-pixbuf-rendering.xml" />
+    <xi:include href="gdk-pixbuf-from-drawables.xml" />
     <xi:include href="xml/util.xml" />
     <xi:include href="xml/animation.xml" />
 
@@ -103,8 +103,8 @@
       </para>
     </partintro>
 
-    <xi:include href="gdk-pixbuf-csource-2.0.xml" />
-    <xi:include href="gdk-pixbuf-query-loaders-2.0.xml" />
+    <xi:include href="gdk-pixbuf-csource.xml" />
+    <xi:include href="gdk-pixbuf-query-loaders.xml" />
   </reference>
 
   <index id="api-index-full">