Make docs parallel installable

This addresses gdk and gtk docs.

configure.ac

@@ -1933,7 +1933,7 @@ docs/reference/Makefile
 docs/reference/gdk/Makefile
 docs/reference/gdk/version.xml
 docs/reference/gtk/Makefile
-docs/reference/gtk/gtk3.types
+docs/reference/gtk/gtk4.types
 docs/reference/gtk/version.xml
 docs/reference/libgail-util/Makefile
 docs/reference/libgail-util/version.xml

docs/reference/gdk/Makefile.am

@@ -3,7 +3,7 @@
 AUTOMAKE_OPTIONS = 1.6
 
 # The name of the module.
-DOC_MODULE=gdk3
+DOC_MODULE=gdk4
 
 # The top-level SGML file.
 DOC_MAIN_SGML_FILE=gdk-docs.sgml
@@ -61,7 +61,7 @@ AM_CPPFLAGS = 			\
 	$(GTK_DEBUG_FLAGS)	\
 	$(GDK_DEP_CFLAGS)
 
-GTKDOC_LIBS = $(top_builddir)/gdk/libgdk-3.la $(GDK_DEP_LIBS)
+GTKDOC_LIBS = $(top_builddir)/gdk/libgdk-4.la $(GDK_DEP_LIBS)
 
 # Extra options to supply to gtkdoc-mkdb
 MKDB_OPTIONS=--output-format=xml --name-space=gdk

docs/reference/gdk/gdk-docs.sgml

@@ -6,7 +6,7 @@
 ]>
 <book id="index" xmlns:xi="http://www.w3.org/2003/XInclude">
   <bookinfo>
-    <title>GDK 3 Reference Manual</title>
+    <title>GDK 4 Reference Manual</title>
     <releaseinfo>
       This document is for the GDK 3 library, version &version;
       The latest versions can be found online at

docs/reference/gtk/Makefile.am

@@ -3,7 +3,7 @@
 AUTOMAKE_OPTIONS = 1.6
 
 # The name of the module.
-DOC_MODULE=gtk3
+DOC_MODULE=gtk4
 
 # The top-level SGML file.
 DOC_MAIN_SGML_FILE=gtk-docs.sgml
@@ -270,8 +270,8 @@ CPPFLAGS += \
 	-UGTK_DISABLE_SINGLE_INCLUDES
 
 GTKDOC_LIBS = \
-	$(top_builddir)/gdk/libgdk-3.la \
-	$(top_builddir)/gtk/libgtk-3.la	\
+	$(top_builddir)/gdk/libgdk-4.la \
+	$(top_builddir)/gtk/libgtk-4.la	\
 	$(GTK_DEP_LIBS)
 
 
@@ -291,14 +291,14 @@ content_files =					\
 	drawing-model.xml			\
 	getting_started.xml			\
 	glossary.xml				\
-	gtk3-demo-application.xml		\
-	gtk3-demo.xml				\
-	gtk3-icon-browser.xml			\
-	gtk3-widget-factory.xml			\
+	gtk4-demo-application.xml		\
+	gtk4-demo.xml				\
+	gtk4-icon-browser.xml			\
+	gtk4-widget-factory.xml			\
 	gtk-builder-tool.xml			\
 	gtk-encode-symbolic-svg.xml		\
 	gtk-launch.xml				\
-	gtk-query-immodules-3.0.xml		\
+	gtk-query-immodules-4.0.xml		\
 	gtk-query-settings.xml			\
 	gtk-update-icon-cache.xml		\
 	input-handling.xml			\
@@ -498,19 +498,19 @@ endif
 include $(top_srcdir)/gtk-doc.make
 
 # Other files to distribute
-EXTRA_DIST += version.xml.in gtk3.types.in
+EXTRA_DIST += version.xml.in gtk4.types.in
 
 ########################################################################
 
 man_MANS = 				\
-	gtk-query-immodules-3.0.1	\
+	gtk-query-immodules-4.0.1	\
 	gtk-update-icon-cache.1		\
 	gtk-encode-symbolic-svg.1	\
 	gtk-launch.1			\
-	gtk3-demo.1			\
-	gtk3-demo-application.1		\
-	gtk3-widget-factory.1		\
-	gtk3-icon-browser.1		\
+	gtk4-demo.1			\
+	gtk4-demo-application.1		\
+	gtk4-widget-factory.1		\
+	gtk4-icon-browser.1		\
 	broadwayd.1			\
 	gtk-builder-tool.1 		\
 	gtk-query-settings.1

docs/reference/gtk/gtk-docs.sgml

@@ -8,13 +8,13 @@
 ]>
 <book id="index" xmlns:xi="http://www.w3.org/2003/XInclude">
   <bookinfo>
-    <title>GTK+ 3 Reference Manual</title>
+    <title>GTK+ 4 Reference Manual</title>
     <releaseinfo>
-      This document is for the GTK+ 3 library, version &version;.
+      This document is for the GTK+ 4 library, version &version;.
       The latest versions can be found online at
-      <ulink role="online-location" url="http://developer.gnome.org/gtk3/">http://developer.gnome.org/gtk3/</ulink>.
-      If you are looking for the older GTK+ 2 series of libraries,
-      see <ulink role="online-location" url="http://developer.gnome.org/gtk2/">http://developer.gnome.org/gtk2/</ulink>.
+      <ulink role="online-location" url="http://developer.gnome.org/gtk4/">http://developer.gnome.org/gtk4/</ulink>.
+      If you are looking for the older GTK+ 3 series of libraries,
+      see <ulink role="online-location" url="http://developer.gnome.org/gtk3/">http://developer.gnome.org/gtk3/</ulink>.
     </releaseinfo>
   </bookinfo>
 
@@ -410,11 +410,11 @@
 
   <part>
     <title>GTK+ Tools</title>
-    <xi:include href="gtk3-demo.xml" />
-    <xi:include href="gtk3-demo-application.xml" />
-    <xi:include href="gtk3-widget-factory.xml" />
-    <xi:include href="gtk3-icon-browser.xml" />
-    <xi:include href="gtk-query-immodules-3.0.xml" />
+    <xi:include href="gtk4-demo.xml" />
+    <xi:include href="gtk4-demo-application.xml" />
+    <xi:include href="gtk4-widget-factory.xml" />
+    <xi:include href="gtk4-icon-browser.xml" />
+    <xi:include href="gtk-query-immodules-4.0.xml" />
     <xi:include href="gtk-update-icon-cache.xml" />
     <xi:include href="gtk-encode-symbolic-svg.xml" />
     <xi:include href="gtk-builder-tool.xml" />

docs/reference/libgail-util/Makefile.am

@@ -3,7 +3,7 @@
 AUTOMAKE_OPTIONS = 1.7
 
 # The name of the module.
-DOC_MODULE=gail-libgail-util3
+DOC_MODULE=gail-libgail-util4
 
 # The top-level SGML file.
 DOC_MAIN_SGML_FILE=gail-libgail-util-docs.sgml
@@ -22,7 +22,7 @@ AM_CPPFLAGS =                   \
         -I$(top_builddir)       \
         $(DEP_CFLAGS)
 
-GTKDOC_LIBS = $(top_builddir)/libgail-util/libgailutil-3.la
+GTKDOC_LIBS = $(top_builddir)/libgail-util/libgailutil-4.la
 
 # gtkdoc-mkdb related varaibles
 MKDB_OPTIONS =