Make docs parallel installable

This addresses gdk and gtk docs.

Makefile.am

@@ -36,40 +36,40 @@ MAINTAINERCLEANFILES = \
 
 
 ## Copy .pc files to target-specific names
-gtk+-x11-3.0.pc gtk+-win32-3.0.pc gtk+-quartz-3.0.pc gtk+-broadway-3.0.pc gtk+-wayland-3.0.pc gtk+-mir-3.0.pc: gtk+-3.0.pc
+gtk+-x11-4.0.pc gtk+-win32-4.0.pc gtk+-quartz-4.0.pc gtk+-broadway-4.0.pc gtk+-wayland-4.0.pc gtk+-mir-4.0.pc: gtk+-4.0.pc
 	rm -f $@ && \
-	cp gtk+-3.0.pc $@
+	cp gtk+-4.0.pc $@
 
-gdk-x11-3.0.pc gdk-win32-3.0.pc gdk-quartz-3.0.pc gdk-broadway-3.0.pc gdk-wayland-3.0.pc gdk-mir-3.0.pc: gdk-3.0.pc
+gdk-x11-4.0.pc gdk-win32-4.0.pc gdk-quartz-4.0.pc gdk-broadway-4.0.pc gdk-wayland-4.0.pc gdk-mir-4.0.pc: gdk-4.0.pc
 	rm -f $@ && \
-	cp gdk-3.0.pc $@
+	cp gdk-4.0.pc $@
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = gdk-3.0.pc gtk+-3.0.pc gail-3.0.pc
-pkgconfig_DATA += ${GDK_BACKENDS:%=gtk+-%-3.0.pc}
-pkgconfig_DATA += ${GDK_BACKENDS:%=gdk-%-3.0.pc}
+pkgconfig_DATA = gdk-4.0.pc gtk+-4.0.pc gail-4.0.pc
+pkgconfig_DATA += ${GDK_BACKENDS:%=gtk+-%-4.0.pc}
+pkgconfig_DATA += ${GDK_BACKENDS:%=gdk-%-4.0.pc}
 
 if OS_UNIX
-pkgconfig_DATA += gtk+-unix-print-3.0.pc
+pkgconfig_DATA += gtk+-unix-print-4.0.pc
 endif
 
 DISTCLEANFILES = \
-	gtk+-unix-print-3.0.pc		\
-	gtk+-3.0.pc			\
-	gtk+-x11-3.0.pc			\
-	gtk+-win32-3.0.pc		\
-	gtk+-quartz-3.0.pc		\
-	gtk+-broadway-3.0.pc		\
-	gtk+-wayland-3.0.pc		\
-	gtk+-mir-3.0.pc			\
-	gdk-3.0.pc			\
-	gdk-x11-3.0.pc			\
-	gdk-win32-3.0.pc		\
-	gdk-quartz-3.0.pc		\
-	gdk-broadway-3.0.pc		\
-	gdk-wayland-3.0.pc		\
-	gdk-mir-3.0.pc			\
-	gail-3.0.pc			\
+	gtk+-unix-print-4.0.pc		\
+	gtk+-4.0.pc			\
+	gtk+-x11-4.0.pc			\
+	gtk+-win32-4.0.pc		\
+	gtk+-quartz-4.0.pc		\
+	gtk+-broadway-4.0.pc		\
+	gtk+-wayland-4.0.pc		\
+	gtk+-mir-4.0.pc			\
+	gdk-4.0.pc			\
+	gdk-x11-4.0.pc			\
+	gdk-win32-4.0.pc		\
+	gdk-quartz-4.0.pc		\
+	gdk-broadway-4.0.pc		\
+	gdk-wayland-4.0.pc		\
+	gdk-mir-4.0.pc			\
+	gail-4.0.pc			\
 	config.lt
 
 distclean-local:
@@ -93,7 +93,7 @@ ChangeLog:
 .PHONY: ChangeLog
 
 uninstall-local:
-	rm -f $(DESTDIR)$(pkgconfigdir)/gtk+-3.0.pc
+	rm -f $(DESTDIR)$(pkgconfigdir)/gtk+-4.0.pc
 
 AM_DISTCHECK_CONFIGURE_FLAGS =		\
 	--enable-gtk-doc 		\

configure.ac

@@ -9,15 +9,15 @@
 # set GTK_BINARY_AGE and GTK_INTERFACE_AGE to 0.
 
 m4_define([gtk_major_version], [3])
-m4_define([gtk_minor_version], [22])
-m4_define([gtk_micro_version], [1])
-m4_define([gtk_interface_age], [1])
+m4_define([gtk_minor_version], [89])
+m4_define([gtk_micro_version], [0])
+m4_define([gtk_interface_age], [0])
 m4_define([gtk_binary_age],
           [m4_eval(100 * gtk_minor_version + gtk_micro_version)])
 m4_define([gtk_version],
           [gtk_major_version.gtk_minor_version.gtk_micro_version])
-# This is the X.Y used in -lgtk-FOO-X.Y
-m4_define([gtk_api_version], [3.0])
+# This is the X.Y used in -lgtk-X.Y
+m4_define([gtk_api_version], [4.0])
 
 AC_PREREQ([2.62])
 AC_INIT([gtk+], [gtk_version],
@@ -38,7 +38,7 @@ AC_CANONICAL_HOST
 # for GTK+.
 #
 #GTK_BINARY_VERSION=$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION.$LT_CURRENT
-m4_define([gtk_binary_version], [3.0.0])
+m4_define([gtk_binary_version], [4.0.0])
 
 # required versions of other packages
 m4_define([glib_required_major], [2])
@@ -1891,10 +1891,10 @@ INSTALL
 config.h.win32
 gtk-zip.sh
 Makefile
-gdk-3.0.pc
-gtk+-3.0.pc
-gtk+-unix-print-3.0.pc
-gail-3.0.pc
+gdk-4.0.pc
+gtk+-4.0.pc
+gtk+-unix-print-4.0.pc
+gail-4.0.pc
 m4macros/Makefile
 po/Makefile.in
 po-properties/Makefile.in
@@ -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

demos/gtk-demo/Makefile.am

@@ -92,11 +92,11 @@ AM_CPPFLAGS = \
 	$(GTK_DEP_CFLAGS)
 
 DEPS = \
-	$(top_builddir)/gtk/libgtk-3.la
+	$(top_builddir)/gtk/libgtk-4.la
 
 LDADDS = \
-	$(top_builddir)/gtk/libgtk-3.la		\
-	$(top_builddir)/gdk/libgdk-3.la		\
+	$(top_builddir)/gtk/libgtk-4.la		\
+	$(top_builddir)/gdk/libgdk-4.la		\
 	$(GTK_DEP_LIBS)				\
 	$(GDK_DEP_LIBS)				\
 	-lm
@@ -106,10 +106,10 @@ AM_CPPFLAGS += $(FONTDEMO_CFLAGS)
 LDADDS += $(FONTDEMO_LIBS)
 endif
 
-bin_PROGRAMS = gtk3-demo gtk3-demo-application
+bin_PROGRAMS = gtk4-demo gtk4-demo-application
 
 desktopdir = $(datadir)/applications
-dist_desktop_DATA = gtk3-demo.desktop
+dist_desktop_DATA = gtk4-demo.desktop
 
 BUILT_SOURCES = demos.h demo_resources.c
 
@@ -132,22 +132,22 @@ demos.h: $(demos) geninclude.pl
 demos.h.win32: $(demos_base) geninclude.pl
 	 $(AM_V_GEN) (here=`pwd` ; cd $(srcdir) && $(PERL) $$here/geninclude.pl $(demos_base)) > demos.h.win32
 
-nodist_gtk3_demo_SOURCES = demos.h
+nodist_gtk4_demo_SOURCES = demos.h
 
-gtk3_demo_SOURCES = 		\
+gtk4_demo_SOURCES = 		\
 	$(demos)		\
 	demo_resources.c	\
 	main.c
 
-gtk3_demo_DEPENDENCIES = $(DEPS)
-gtk3_demo_LDADD = $(LDADDS)
-gtk3_demo_LDFLAGS = -export-dynamic
+gtk4_demo_DEPENDENCIES = $(DEPS)
+gtk4_demo_LDADD = $(LDADDS)
+gtk4_demo_LDFLAGS = -export-dynamic
 
-gtk3_demo_application_SOURCES = \
+gtk4_demo_application_SOURCES = \
 	application.c 		\
 	demo_resources.c
 
-gtk3_demo_application_LDADD = $(LDADDS)
+gtk4_demo_application_LDADD = $(LDADDS)
 
 resource_files = $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(builddir)/demo.gresource.xml)
 
@@ -164,12 +164,12 @@ appsicon48dir = $(iconthemedir)/48x48/apps
 appsicon256dir = $(iconthemedir)/256x256/apps
 appsiconscalabledir = $(iconthemedir)/scalable/apps
 
-dist_appsicon16_DATA = data/16x16/gtk3-demo.png data/16x16/gtk3-demo-symbolic.symbolic.png
-dist_appsicon22_DATA = data/22x22/gtk3-demo.png data/22x22/gtk3-demo-symbolic.symbolic.png
-dist_appsicon24_DATA = data/24x24/gtk3-demo.png data/24x24/gtk3-demo-symbolic.symbolic.png
-dist_appsicon32_DATA = data/32x32/gtk3-demo.png data/32x32/gtk3-demo-symbolic.symbolic.png
-dist_appsicon48_DATA = data/48x48/gtk3-demo.png data/48x48/gtk3-demo-symbolic.symbolic.png
-dist_appsicon256_DATA = data/256x256/gtk3-demo.png data/256x256/gtk3-demo-symbolic.symbolic.png
+dist_appsicon16_DATA = data/16x16/gtk4-demo.png data/16x16/gtk4-demo-symbolic.symbolic.png
+dist_appsicon22_DATA = data/22x22/gtk4-demo.png data/22x22/gtk4-demo-symbolic.symbolic.png
+dist_appsicon24_DATA = data/24x24/gtk4-demo.png data/24x24/gtk4-demo-symbolic.symbolic.png
+dist_appsicon32_DATA = data/32x32/gtk4-demo.png data/32x32/gtk4-demo-symbolic.symbolic.png
+dist_appsicon48_DATA = data/48x48/gtk4-demo.png data/48x48/gtk4-demo-symbolic.symbolic.png
+dist_appsicon256_DATA = data/256x256/gtk4-demo.png data/256x256/gtk4-demo-symbolic.symbolic.png
 
 update_icon_cache = $(top_builddir)/gtk/gtk-update-icon-cache$(EXEEXT) --ignore-theme-index --force
 
@@ -185,19 +185,19 @@ uninstall-update-icon-cache:
 	test -n "$(DESTDIR)" || $(update_icon_cache) "$(iconthemedir)"
 
 # ------------------- MSVC Build Items ----------------
-MSVCPROJS = gtk3-demo gtk3-demo-application
+MSVCPROJS = gtk4-demo gtk4-demo-application
 
-gtk3_demo_FILES = $(gtk3_demo_SOURCES)
-gtk3_demo_EXCLUDES = font_features.c|pagesetup.c
+gtk4_demo_FILES = $(gtk4_demo_SOURCES)
+gtk4_demo_EXCLUDES = font_features.c|pagesetup.c
 
-gtk3_demo_application_FILES = $(gtk3_demo_application_SOURCES)
-gtk3_demo_application_EXCLUDES = dummy
+gtk4_demo_application_FILES = $(gtk4_demo_application_SOURCES)
+gtk4_demo_application_EXCLUDES = dummy
 
 include $(top_srcdir)/build/Makefile.msvcproj
 
 dist-hook: \
-	$(top_builddir)/build/win32/vs9/gtk3-demo.vcproj	\
-	$(top_builddir)/build/win32/vs9/gtk3-demo-application.vcproj
+	$(top_builddir)/build/win32/vs9/gtk4-demo.vcproj	\
+	$(top_builddir)/build/win42/vs9/gtk4-demo-application.vcproj
 
 DISTCLEANFILES = demos.h demos.h.win32
 

demos/gtk-demo/gtk3-demo.desktop

@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=GTK+ Demo
-Comment=GTK+ code examples and demonstrations
-Exec=gtk3-demo
-Icon=gtk3-demo
-Terminal=false
-Type=Application
-StartupNotify=true
-Categories=Development;GTK;
-NoDisplay=true

demos/icon-browser/Makefile.am

@@ -6,17 +6,17 @@ AM_CPPFLAGS = \
 	$(GTK_DEP_CFLAGS)
 
 LDADD = \
-        $(top_builddir)/gtk/libgtk-3.la \
-        $(top_builddir)/gdk/libgdk-3.la \
+        $(top_builddir)/gtk/libgtk-4.la \
+        $(top_builddir)/gdk/libgdk-4.la \
         $(GTK_DEP_LIBS)
 
 
-bin_PROGRAMS = gtk3-icon-browser
+bin_PROGRAMS = gtk4-icon-browser
 
 desktopdir = $(datadir)/applications
-dist_desktop_DATA = gtk3-icon-browser.desktop
+dist_desktop_DATA = gtk4-icon-browser.desktop
 
-gtk3_icon_browser_SOURCES = \
+gtk4_icon_browser_SOURCES = \
 	main.c \
 	iconbrowserapp.c iconbrowserapp.h \
 	iconbrowserwin.c iconbrowserwin.h \
@@ -36,13 +36,13 @@ EXTRA_DIST = \
 	window.ui
 
 # ------------------- MSVC Build Items ----------------
-MSVCPROJS = gtk3-icon-browser
+MSVCPROJS = gtk4-icon-browser
 
-gtk3_icon_browser_FILES = $(gtk3_icon_browser_SOURCES)
-gtk3_icon_browser_EXCLUDES = dummy
+gtk4_icon_browser_FILES = $(gtk4_icon_browser_SOURCES)
+gtk4_icon_browser_EXCLUDES = dummy
 
 include $(top_srcdir)/build/Makefile.msvcproj
 
-dist-hook: $(top_builddir)/build/win32/vs9/gtk3-icon-browser.vcproj
+dist-hook: $(top_builddir)/build/win32/vs9/gtk4-icon-browser.vcproj
 
 -include $(top_srcdir)/git.mk

demos/icon-browser/gtk3-icon-browser.desktop

@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=Icon Browser
-Comment=An application that shows themed icons
-Exec=gtk3-icon-browser
-Icon=gtk3-icon-browser
-Terminal=false
-Type=Application
-StartupNotify=true
-Categories=Development;GTK;
-NoDisplay=true

demos/widget-factory/Makefile.am

@@ -1,29 +1,29 @@
 include $(top_srcdir)/Makefile.decl
 
-bin_PROGRAMS = gtk3-widget-factory
+bin_PROGRAMS = gtk4-widget-factory
 
 desktopdir = $(datadir)/applications
-dist_desktop_DATA = gtk3-widget-factory.desktop
+dist_desktop_DATA = gtk4-widget-factory.desktop
 
-gtk3_widget_factory_SOURCES = 		\
+gtk4_widget_factory_SOURCES = 		\
 	widget-factory.c		\
 	widget_factory_resources.c
 
 BUILT_SOURCES = 			\
 	widget_factory_resources.c
 
-gtk3_widget_factory_DEPENDENCIES = 	\
-	$(top_builddir)/gtk/libgtk-3.la
+gtk4_widget_factory_DEPENDENCIES = 	\
+	$(top_builddir)/gtk/libgtk-4.la
 
-gtk3_widget_factory_CPPFLAGS = 		\
+gtk4_widget_factory_CPPFLAGS = 		\
 	-I$(top_srcdir)			\
 	$(GTK_DEBUG_FLAGS)		\
 	$(GTK_DEP_CFLAGS)		\
 	$(NULL)
 
-gtk3_widget_factory_LDADD = 		\
-	$(top_builddir)/gdk/libgdk-3.la \
-	$(top_builddir)/gtk/libgtk-3.la \
+gtk4_widget_factory_LDADD = 		\
+	$(top_builddir)/gdk/libgdk-4.la \
+	$(top_builddir)/gtk/libgtk-4.la \
 	$(GTK_DEP_LIBS)			\
 	$(NULL)
 
@@ -40,12 +40,12 @@ appsicon32dir = $(iconthemedir)/32x32/apps
 appsicon48dir = $(iconthemedir)/48x48/apps
 appsicon256dir = $(iconthemedir)/256x256/apps
 
-dist_appsicon16_DATA = data/16x16/gtk3-widget-factory.png data/16x16/gtk3-widget-factory-symbolic.symbolic.png
-dist_appsicon22_DATA = data/22x22/gtk3-widget-factory.png data/22x22/gtk3-widget-factory-symbolic.symbolic.png
-dist_appsicon24_DATA = data/24x24/gtk3-widget-factory.png data/24x24/gtk3-widget-factory-symbolic.symbolic.png
-dist_appsicon32_DATA = data/32x32/gtk3-widget-factory.png data/32x32/gtk3-widget-factory-symbolic.symbolic.png
-dist_appsicon48_DATA = data/48x48/gtk3-widget-factory.png data/48x48/gtk3-widget-factory-symbolic.symbolic.png
-dist_appsicon256_DATA = data/256x256/gtk3-widget-factory.png data/256x256/gtk3-widget-factory-symbolic.symbolic.png
+dist_appsicon16_DATA = data/16x16/gtk4-widget-factory.png data/16x16/gtk4-widget-factory-symbolic.symbolic.png
+dist_appsicon22_DATA = data/22x22/gtk4-widget-factory.png data/22x22/gtk4-widget-factory-symbolic.symbolic.png
+dist_appsicon24_DATA = data/24x24/gtk4-widget-factory.png data/24x24/gtk4-widget-factory-symbolic.symbolic.png
+dist_appsicon32_DATA = data/32x32/gtk4-widget-factory.png data/32x32/gtk4-widget-factory-symbolic.symbolic.png
+dist_appsicon48_DATA = data/48x48/gtk4-widget-factory.png data/48x48/gtk4-widget-factory-symbolic.symbolic.png
+dist_appsicon256_DATA = data/256x256/gtk4-widget-factory.png data/256x256/gtk4-widget-factory-symbolic.symbolic.png
 
 update_icon_cache = $(top_builddir)/gtk/gtk-update-icon-cache$(EXEEXT) --ignore-theme-index --force
 

demos/widget-factory/gtk3-widget-factory.desktop

@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=Widget Factory
-Comment=A showcase for GTK+ widgets, designed for testing themes.
-Exec=gtk3-widget-factory
-Icon=gtk3-widget-factory
-Terminal=false
-Type=Application
-StartupNotify=true
-Categories=Development;GTK;
-NoDisplay=true

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" />

examples/Makefile.am

@@ -15,8 +15,8 @@ AM_CPPFLAGS = \
 	$(GTK_DEP_CFLAGS)
 
 LDADD = \
-	$(top_builddir)/gtk/libgtk-3.la	\
-	$(top_builddir)/gdk/libgdk-3.la \
+	$(top_builddir)/gtk/libgtk-4.la	\
+	$(top_builddir)/gdk/libgdk-4.la \
 	$(GTK_DEP_LIBS)
 
 noinst_PROGRAMS = \

examples/application1/Makefile.am

@@ -3,8 +3,8 @@ GTK_CFLAGS = 					\
 	$(GTK_DEP_CFLAGS)
 
 GTK_LIBS = 					\
-        $(top_builddir)/gtk/libgtk-3.la 	\
-        $(top_builddir)/gdk/libgdk-3.la 	\
+        $(top_builddir)/gtk/libgtk-4.la 	\
+        $(top_builddir)/gdk/libgdk-4.la 	\
         $(GTK_DEP_LIBS)
 
 

examples/application10/Makefile.am

@@ -3,8 +3,8 @@ GTK_CFLAGS =			 		\
 	$(GTK_DEP_CFLAGS)
 
 GTK_LIBS = 					\
-        $(top_builddir)/gtk/libgtk-3.la 	\
-        $(top_builddir)/gdk/libgdk-3.la 	\
+        $(top_builddir)/gtk/libgtk-4.la 	\
+        $(top_builddir)/gdk/libgdk-4.la 	\
         $(GTK_DEP_LIBS)
 
 

examples/application2/Makefile.am

@@ -3,8 +3,8 @@ GTK_CFLAGS =	 				\
 	$(GTK_DEP_CFLAGS)
 
 GTK_LIBS = 					\
-        $(top_builddir)/gtk/libgtk-3.la 	\
-        $(top_builddir)/gdk/libgdk-3.la 	\
+        $(top_builddir)/gtk/libgtk-4.la 	\
+        $(top_builddir)/gdk/libgdk-4.la 	\
         $(GTK_DEP_LIBS)
 
 

examples/application3/Makefile.am

@@ -3,8 +3,8 @@ GTK_CFLAGS =	 				\
 	$(GTK_DEP_CFLAGS)
 
 GTK_LIBS = 					\
-        $(top_builddir)/gtk/libgtk-3.la 	\
-        $(top_builddir)/gdk/libgdk-3.la 	\
+        $(top_builddir)/gtk/libgtk-4.la 	\
+        $(top_builddir)/gdk/libgdk-4.la 	\
         $(GTK_DEP_LIBS)
 
 

examples/application4/Makefile.am

@@ -3,8 +3,8 @@ GTK_CFLAGS = 					\
 	$(GTK_DEP_CFLAGS)
 
 GTK_LIBS = 					\
-        $(top_builddir)/gtk/libgtk-3.la 	\
-        $(top_builddir)/gdk/libgdk-3.la 	\
+        $(top_builddir)/gtk/libgtk-4.la 	\
+        $(top_builddir)/gdk/libgdk-4.la 	\
         $(GTK_DEP_LIBS)
 
 

examples/application5/Makefile.am

@@ -3,8 +3,8 @@ GTK_CFLAGS = 					\
 	$(GTK_DEP_CFLAGS)
 
 GTK_LIBS = 					\
-        $(top_builddir)/gtk/libgtk-3.la 	\
-        $(top_builddir)/gdk/libgdk-3.la 	\
+        $(top_builddir)/gtk/libgtk-4.la 	\
+        $(top_builddir)/gdk/libgdk-4.la 	\
         $(GTK_DEP_LIBS)
 
 

examples/application6/Makefile.am

@@ -3,8 +3,8 @@ GTK_CFLAGS = 					\
 	$(GTK_DEP_CFLAGS)
 
 GTK_LIBS = 					\
-        $(top_builddir)/gtk/libgtk-3.la 	\
-        $(top_builddir)/gdk/libgdk-3.la 	\
+        $(top_builddir)/gtk/libgtk-4.la 	\
+        $(top_builddir)/gdk/libgdk-4.la 	\
         $(GTK_DEP_LIBS)
 
 

examples/application7/Makefile.am

@@ -3,8 +3,8 @@ GTK_CFLAGS = 					\
 	$(GTK_DEP_CFLAGS)
 
 GTK_LIBS = 					\
-        $(top_builddir)/gtk/libgtk-3.la 	\
-        $(top_builddir)/gdk/libgdk-3.la 	\
+        $(top_builddir)/gtk/libgtk-4.la 	\
+        $(top_builddir)/gdk/libgdk-4.la 	\
         $(GTK_DEP_LIBS)
 
 

examples/application8/Makefile.am

@@ -3,8 +3,8 @@ GTK_CFLAGS =			 		\
 	$(GTK_DEP_CFLAGS)
 
 GTK_LIBS = 					\
-        $(top_builddir)/gtk/libgtk-3.la 	\
-        $(top_builddir)/gdk/libgdk-3.la 	\
+        $(top_builddir)/gtk/libgtk-4.la 	\
+        $(top_builddir)/gdk/libgdk-4.la 	\
         $(GTK_DEP_LIBS)
 
 

examples/application9/Makefile.am

@@ -3,8 +3,8 @@ GTK_CFLAGS =			 		\
 	$(GTK_DEP_CFLAGS)
 
 GTK_LIBS = 					\
-        $(top_builddir)/gtk/libgtk-3.la 	\
-        $(top_builddir)/gdk/libgdk-3.la 	\
+        $(top_builddir)/gtk/libgtk-4.la 	\
+        $(top_builddir)/gdk/libgdk-4.la 	\
         $(GTK_DEP_LIBS)
 
 

examples/bp/Makefile.am

@@ -7,8 +7,8 @@ AM_CPPFLAGS = \
 	$(GTK_DEP_CFLAGS)
 
 LDADD = \
-        $(top_builddir)/gtk/libgtk-3.la \
-        $(top_builddir)/gdk/libgdk-3.la \
+        $(top_builddir)/gtk/libgtk-4.la \
+        $(top_builddir)/gdk/libgdk-4.la \
         $(GTK_DEP_LIBS)
 
 noinst_PROGRAMS = bloatpad

gdk/Makefile.am

@@ -190,11 +190,11 @@ gdk_built_sources = 				\
 # setup GDK sources and their dependencies
 #
 
-gdkincludedir = $(includedir)/gtk-3.0/gdk
+gdkincludedir = $(includedir)/gtk-4.0/gdk
 gdkinclude_HEADERS = $(gdk_public_h_sources)
 nodist_gdkinclude_HEADERS = gdkconfig.h gdkenumtypes.h gdkversionmacros.h
 
-deprecatedincludedir = $(includedir)/gtk-3.0/gdk/deprecated
+deprecatedincludedir = $(includedir)/gtk-4.0/gdk/deprecated
 deprecatedinclude_HEADERS = $(deprecated_h_sources)
 
 common_sources = 		\
@@ -206,36 +206,36 @@ common_sources = 		\
 	gdkresources.h		\
 	gdkresources.c
 
-libgdk_3_la_SOURCES = $(common_sources)
-libgdk_3_la_CFLAGS = $(AM_CFLAGS) $(GDK_HIDDEN_VISIBILITY_CFLAGS)
-libgdk_3_la_LIBADD = $(GDK_DEP_LIBS) $(SHM_LIBS)
-libgdk_3_la_LDFLAGS = $(LDADD)
+libgdk_4_la_SOURCES = $(common_sources)
+libgdk_4_la_CFLAGS = $(AM_CFLAGS) $(GDK_HIDDEN_VISIBILITY_CFLAGS)
+libgdk_4_la_LIBADD = $(GDK_DEP_LIBS) $(SHM_LIBS)
+libgdk_4_la_LDFLAGS = $(LDADD)
 
 if USE_X11
-libgdk_3_la_LIBADD += x11/libgdk-x11.la
+libgdk_4_la_LIBADD += x11/libgdk-x11.la
 endif # USE_X11
 
 if USE_QUARTZ
-libgdk_3_la_CFLAGS += -xobjective-c
-libgdk_3_la_LIBADD += quartz/libgdk-quartz.la
+libgdk_4_la_CFLAGS += -xobjective-c
+libgdk_4_la_LIBADD += quartz/libgdk-quartz.la
 endif # USE_QUARTZ
 
 if USE_WIN32
-libgdk_3_la_LIBADD += win32/libgdk-win32.la
-libgdk_3_la_DEPENDENCIES = win32/libgdk-win32.la win32/rc/gdk-win32-res.o
-libgdk_3_la_LDFLAGS += -Wl,win32/rc/gdk-win32-res.o
+libgdk_4_la_LIBADD += win32/libgdk-win32.la
+libgdk_4_la_DEPENDENCIES = win32/libgdk-win32.la win32/rc/gdk-win32-res.o
+libgdk_4_la_LDFLAGS += -Wl,win32/rc/gdk-win32-res.o
 endif # USE_WIN32
 
 if USE_BROADWAY
-libgdk_3_la_LIBADD += broadway/libgdk-broadway.la
+libgdk_4_la_LIBADD += broadway/libgdk-broadway.la
 endif # USE_BROADWAY
 
 if USE_WAYLAND
-libgdk_3_la_LIBADD += wayland/libgdk-wayland.la
+libgdk_4_la_LIBADD += wayland/libgdk-wayland.la
 endif
 
 if USE_MIR
-libgdk_3_la_LIBADD += mir/libgdk-mir.la
+libgdk_4_la_LIBADD += mir/libgdk-mir.la
 endif
 
 if HAVE_INTROSPECTION
@@ -246,17 +246,17 @@ introspection_files = 		\
         gdkenumtypes.c		\
         gdkenumtypes.h
 
-Gdk-3.0.gir: libgdk-3.la Makefile
-Gdk_3_0_gir_SCANNERFLAGS = 	\
+Gdk-4.0.gir: libgdk-4.la Makefile
+Gdk_4_0_gir_SCANNERFLAGS = 	\
 	--c-include="gdk/gdk.h"
-Gdk_3_0_gir_INCLUDES = Gio-2.0 GdkPixbuf-2.0 Pango-1.0 cairo-1.0
-Gdk_3_0_gir_LIBS = libgdk-3.la
-Gdk_3_0_gir_FILES = $(introspection_files)
-Gdk_3_0_gir_CFLAGS = $(AM_CPPFLAGS)
-Gdk_3_0_gir_EXPORT_PACKAGES = gdk-3.0
-INTROSPECTION_GIRS += Gdk-3.0.gir
+Gdk_4_0_gir_INCLUDES = Gio-2.0 GdkPixbuf-2.0 Pango-1.0 cairo-1.0
+Gdk_4_0_gir_LIBS = libgdk-4.la
+Gdk_4_0_gir_FILES = $(introspection_files)
+Gdk_4_0_gir_CFLAGS = $(AM_CPPFLAGS)
+Gdk_4_0_gir_EXPORT_PACKAGES = gdk-4.0
+INTROSPECTION_GIRS += Gdk-4.0.gir
 if OS_WIN32
-Gdk_3_0_gir_CFLAGS += -I$(srcdir)/win32 -I$(srcdir)
+Gdk_4_0_gir_CFLAGS += -I$(srcdir)/win32 -I$(srcdir)
 endif
 if USE_X11
 x11_introspection_files = 		\
@@ -306,17 +306,17 @@ x11_introspection_files = 		\
 	x11/gdkx11visual.h		\
 	x11/gdkx11window.h
 
-GdkX11-3.0.gir: libgdk-3.la Gdk-3.0.gir Makefile
-GdkX11_3_0_gir_SCANNERFLAGS = 		\
+GdkX11-4.0.gir: libgdk-4.la Gdk-4.0.gir Makefile
+GdkX11_4_0_gir_SCANNERFLAGS = 		\
 	--identifier-prefix=Gdk		\
 	--c-include="gdk/gdkx.h"	\
-	--include-uninstalled=$(top_builddir)/gdk/Gdk-3.0.gir
-GdkX11_3_0_gir_INCLUDES = Gio-2.0 GdkPixbuf-2.0 Pango-1.0 xlib-2.0
-GdkX11_3_0_gir_LIBS = libgdk-3.la
-GdkX11_3_0_gir_FILES = $(x11_introspection_files)
-GdkX11_3_0_gir_CFLAGS = $(AM_CPPFLAGS) -L$(top_builddir)/gdk
-GdkX11_3_0_gir_EXPORT_PACKAGES = gdk-x11-3.0
-INTROSPECTION_GIRS += GdkX11-3.0.gir
+	--include-uninstalled=$(top_builddir)/gdk/Gdk-4.0.gir
+GdkX11_4_0_gir_INCLUDES = Gio-2.0 GdkPixbuf-2.0 Pango-1.0 xlib-2.0
+GdkX11_4_0_gir_LIBS = libgdk-4.la
+GdkX11_4_0_gir_FILES = $(x11_introspection_files)
+GdkX11_4_0_gir_CFLAGS = $(AM_CPPFLAGS) -L$(top_builddir)/gdk
+GdkX11_4_0_gir_EXPORT_PACKAGES = gdk-x11-4.0
+INTROSPECTION_GIRS += GdkX11-4.0.gir
 
 endif # USE_X11
 
@@ -351,16 +351,16 @@ w32_introspection_files =		\
 	win32/gdkwindow-win32.c
 
 if OS_WIN32
-GdkWin32-3.0.gir: libgdk-3.la Gdk-3.0.gir Makefile
-GdkWin32_3_0_gir_SCANNERFLAGS = \
+GdkWin32-4.0.gir: libgdk-3.la Gdk-4.0.gir Makefile
+GdkWin32_4_0_gir_SCANNERFLAGS = \
 	--identifier-prefix=Gdk		\
 	--c-include="gdk/gdkwin32.h"	\
-	--include-uninstalled=$(top_builddir)/gdk/Gdk-3.0.gir
-GdkWin32_3_0_gir_INCLUDES = Gio-2.0 GdkPixbuf-2.0 Pango-1.0
-GdkWin32_3_0_gir_LIBS = libgdk-3.la
-GdkWin32_3_0_gir_FILES = $(w32_introspection_files)
-GdkWin32_3_0_gir_CFLAGS = $(AM_CPPFLAGS) -L$(top_builddir)/gdk -I$(srcdir)/win32 -I$(srcdir)
-INTROSPECTION_GIRS += GdkWin32-3.0.gir
+	--include-uninstalled=$(top_builddir)/gdk/Gdk-4.0.gir
+GdkWin32_4_0_gir_INCLUDES = Gio-2.0 GdkPixbuf-2.0 Pango-1.0
+GdkWin32_4_0_gir_LIBS = libgdk-4.la
+GdkWin32_4_0_gir_FILES = $(w32_introspection_files)
+GdkWin32_4_0_gir_CFLAGS = $(AM_CPPFLAGS) -L$(top_builddir)/gdk -I$(srcdir)/win32 -I$(srcdir)
+INTROSPECTION_GIRS += GdkWin32-4.0.gir
 
 endif # OS_WIN32
 
@@ -375,15 +375,15 @@ CLEANFILES += $(gir_DATA) $(typelibs_DATA)
 endif # HAVE_INTROSPECTION
 
 if OS_WIN32
-gdk.def: libgdk-3.la
+gdk.def: libgdk-4.la
 	echo "LIBRARY libgdk-$(GTK_MAJOR_VERSION)-@LT_CURRENT_MINUS_AGE@" >$@
 	echo "EXPORTS" >>$@
 	objdump -p .libs/libgdk-$(GTK_MAJOR_VERSION)-@LT_CURRENT_MINUS_AGE@.dll | sed -n -e 's/\t\[\s\+\([0-9]\+\)\]\s\([A-Za-z_][A-Za-z0-9_]\)/\2/p' >>$@
 install-def-file: gdk.def
 	mkdir -p $(DESTDIR)$(libdir)
-	$(INSTALL) gdk.def $(DESTDIR)$(libdir)/gdk-win32-3.0.def
+	$(INSTALL) gdk.def $(DESTDIR)$(libdir)/gdk-win32-4.0.def
 uninstall-def-file:
-	-rm $(DESTDIR)$(libdir)/gdk-win32-3.0.def
+	-rm $(DESTDIR)$(libdir)/gdk-win32-4.0.def
 else
 install-def-file:
 uninstall-def-file:
@@ -392,7 +392,7 @@ endif
 if MS_LIB_AVAILABLE
 noinst_DATA = gdk-win32-$(GTK_API_VERSION).lib
 
-gdk-win32-$(GTK_API_VERSION).lib: libgdk-3.la gdk.def
+gdk-win32-$(GTK_API_VERSION).lib: libgdk-4.la gdk.def
 	lib -machine:@LIB_EXE_MACHINE_FLAG@ -name:libgdk-win32-$(GTK_API_VERSION)-@LT_CURRENT_MINUS_AGE@.dll -def:gdk.def -out:$@
 
 install-ms-lib:
@@ -406,7 +406,7 @@ install-ms-lib:
 uninstall-ms-lib:
 endif
 
-lib_LTLIBRARIES = libgdk-3.la
+lib_LTLIBRARIES = libgdk-4.la
 
 MAINTAINERCLEANFILES = $(gdk_built_sources) stamp-gdkenumtypes.h
 EXTRA_DIST += \
@@ -415,7 +415,7 @@ EXTRA_DIST += \
 
 install-exec-hook:
 if DISABLE_EXPLICIT_DEPS
-	$(SHELL) $(top_srcdir)/sanitize-la.sh $(DESTDIR)$(libdir)/libgdk-3.la
+	$(SHELL) $(top_srcdir)/sanitize-la.sh $(DESTDIR)$(libdir)/libgdk-4.la
 endif
 
 BUILT_SOURCES = \
@@ -495,50 +495,50 @@ gdkresources.c: gdk.gresource.xml $(resource_files)
 		--sourcedir=$(srcdir) --c-name _gdk --generate-source --manual-register
 
 # ------------------- MSVC Build Items ----------------
-MSVCPROJS = gdk-3
+MSVCPROJS = gdk-4
 
-gdk_3_FILES = $(libgdk_3_la_SOURCES)
-gdk_3_EXCLUDES = dummy
-gdk_3_HEADERS_DIR = $(gdkincludedir)
+gdk_4_FILES = $(libgdk_4_la_SOURCES)
+gdk_4_EXCLUDES = dummy
+gdk_4_HEADERS_DIR = $(gdkincludedir)
 
-gdk_3_HEADERS_INST = \
+gdk_4_HEADERS_INST = \
 	$(gdkinclude_HEADERS)		\
 	$(deprecatedinclude_HEADERS)	\
 	$(nodist_gdkinclude_HEADERS)
 
-gdk_3_HEADERS_EXCLUDES = dummy
+gdk_4_HEADERS_EXCLUDES = dummy
 
 include $(top_srcdir)/build/Makefile.msvcproj
 
 if HAVE_INTROSPECTION
 # Introspection Items for MSVC
-MSVC_INTROSPECT_GIRS = Gdk-3.0.gir GdkWin32-3.0.gir
+MSVC_INTROSPECT_GIRS = Gdk-4.0.gir GdkWin32-4.0.gir
 
 BASE_MSVC_GIR_CFLAGS =			\
 	$(GDK_CFLAGS_DEFINES)		\
 	-I../.. -I../../gdk -I.../../gdk/win32
 
 INTROSPECTION_INTERMEDIATE_ITEMS = \
-	$(top_builddir)/build/win32/Gdk-3.0.gir.msvc.introspect	\
-	$(top_builddir)/build/win32/Gdk_3_0_gir_list			\
-	$(top_builddir)/build/win32/GdkWin32-3.0.gir.msvc.introspect	\
-	$(top_builddir)/build/win32/GdkWin32_3_0_gir_list
+	$(top_builddir)/build/win32/Gdk-4.0.gir.msvc.introspect	\
+	$(top_builddir)/build/win32/Gdk_4_0_gir_list			\
+	$(top_builddir)/build/win32/GdkWin32-4.0.gir.msvc.introspect	\
+	$(top_builddir)/build/win32/GdkWin32_4_0_gir_list
 
-Gdk_3_0_gir_MSVC_FILES = $(introspection_files)
-Gdk_3_0_gir_MSVC_EXPORT_PACKAGES = $(Gdk_3_0_gir_EXPORT_PACKAGES)
-Gdk_3_0_gir_MSVC_INCLUDE_GIRS = $(Gdk_3_0_gir_INCLUDES)
-Gdk_3_0_gir_MSVC_LIBS = gdk-3.0
-Gdk_3_0_gir_MSVC_CFLAGS = $(BASE_MSVC_GIR_CFLAGS)
-Gdk_3_0_gir_MSVC_SCANNERFLAGS = $(Gdk_3_0_gir_SCANNERFLAGS)
+Gdk_4_0_gir_MSVC_FILES = $(introspection_files)
+Gdk_4_0_gir_MSVC_EXPORT_PACKAGES = $(Gdk_4_0_gir_EXPORT_PACKAGES)
+Gdk_4_0_gir_MSVC_INCLUDE_GIRS = $(Gdk_4_0_gir_INCLUDES)
+Gdk_4_0_gir_MSVC_LIBS = gdk-4.0
+Gdk_4_0_gir_MSVC_CFLAGS = $(BASE_MSVC_GIR_CFLAGS)
+Gdk_4_0_gir_MSVC_SCANNERFLAGS = $(Gdk_4_0_gir_SCANNERFLAGS)
 
-GdkWin32_3_0_gir_MSVC_FILES = $(w32_introspection_files)
-GdkWin32_3_0_gir_MSVC_INCLUDE_GIRS = $(GdkWin32_3_0_gir_INCLUDES)
-GdkWin32_3_0_gir_MSVC_LIBS = $(Gdk_3_0_gir_MSVC_LIBS)
-GdkWin32_3_0_gir_MSVC_CFLAGS = $(BASE_MSVC_GIR_CFLAGS)
-GdkWin32_3_0_gir_MSVC_SCANNERFLAGS =	\
+GdkWin32_4_0_gir_MSVC_FILES = $(w32_introspection_files)
+GdkWin32_4_0_gir_MSVC_INCLUDE_GIRS = $(GdkWin32_4_0_gir_INCLUDES)
+GdkWin32_4_0_gir_MSVC_LIBS = $(Gdk_4_0_gir_MSVC_LIBS)
+GdkWin32_4_0_gir_MSVC_CFLAGS = $(BASE_MSVC_GIR_CFLAGS)
+GdkWin32_4_0_gir_MSVC_SCANNERFLAGS =	\
 	--identifier-prefix=Gdk		\
 	--c-include="gdk/gdkwin32.h"	\
-	--include-uninstalled=./Gdk-3.0.gir
+	--include-uninstalled=./Gdk-4.0.gir
 
 include $(top_srcdir)/build/Makefile.msvc-introspection
 

gdk/broadway/Makefile.am

@@ -2,8 +2,8 @@
 include $(top_srcdir)/Makefile.decl
 NULL =
 
-libgdkincludedir = $(includedir)/gtk-3.0/gdk
-libgdkbroadwayincludedir = $(includedir)/gtk-3.0/gdk/broadway
+libgdkincludedir = $(includedir)/gtk-4.0/gdk
+libgdkbroadwayincludedir = $(includedir)/gtk-4.0/gdk/broadway
 
 AM_CPPFLAGS =				\
 	-DG_LOG_DOMAIN=\"Gdk\"		\

gdk/mir/Makefile.am

@@ -1,8 +1,8 @@
 ## Process this file with automake to produce Makefile.in
 include $(top_srcdir)/Makefile.decl
 
-libgdkincludedir = $(includedir)/gtk-3.0/gdk
-libgdkmirincludedir = $(includedir)/gtk-3.0/gdk/mir
+libgdkincludedir = $(includedir)/gtk-4.0/gdk
+libgdkmirincludedir = $(includedir)/gtk-4.0/gdk/mir
 
 AM_CPPFLAGS = \
 	-DG_LOG_DOMAIN=\"Gdk\" \

gdk/quartz/Makefile.am

@@ -1,7 +1,7 @@
 include $(top_srcdir)/Makefile.decl
 
-libgdkincludedir = $(includedir)/gtk-3.0/gdk
-libgdkquartzincludedir = $(includedir)/gtk-3.0/gdk/quartz
+libgdkincludedir = $(includedir)/gtk-4.0/gdk
+libgdkquartzincludedir = $(includedir)/gtk-4.0/gdk/quartz
 
 AM_CPPFLAGS = 				\
 	-DG_LOG_DOMAIN=\"Gdk\"		\

gdk/wayland/Makefile.am

@@ -1,8 +1,8 @@
 ## Process this file with automake to produce Makefile.in
 include $(top_srcdir)/Makefile.decl
 
-libgdkincludedir = $(includedir)/gtk-3.0/gdk
-libgdkwaylandincludedir = $(includedir)/gtk-3.0/gdk/wayland
+libgdkincludedir = $(includedir)/gtk-4.0/gdk
+libgdkwaylandincludedir = $(includedir)/gtk-4.0/gdk/wayland
 
 AM_CPPFLAGS =					\
 	-DG_LOG_DOMAIN=\"Gdk\"			\

gdk/win32/Makefile.am

@@ -1,8 +1,8 @@
 ## Process this file with automake to produce Makefile.in
 include $(top_srcdir)/Makefile.decl
 
-libgdkincludedir = $(includedir)/gtk-3.0/gdk
-libgdkwin32includedir = $(includedir)/gtk-3.0/gdk/win32
+libgdkincludedir = $(includedir)/gtk-4.0/gdk
+libgdkwin32includedir = $(includedir)/gtk-4.0/gdk/win32
 
 AM_CPPFLAGS = \
 	-DG_LOG_DOMAIN=\"Gdk\"		\

gdk/x11/Makefile.am

@@ -1,8 +1,8 @@
 ## Process this file with automake to produce Makefile.in
 include $(top_srcdir)/Makefile.decl
 
-libgdkincludedir = $(includedir)/gtk-3.0/gdk
-libgdkx11includedir = $(includedir)/gtk-3.0/gdk/x11
+libgdkincludedir = $(includedir)/gtk-4.0/gdk
+libgdkx11includedir = $(includedir)/gtk-4.0/gdk/x11
 
 AM_CPPFLAGS = 				\
 	-DG_LOG_DOMAIN=\"Gdk\"		\

gtk/Makefile.am

@@ -48,7 +48,7 @@ gtk-win32.rc: gtk-win32.rc.body
 	cat $< >>$@
 	echo "ISOLATIONAWARE_MANIFEST_RESOURCE_ID RT_MANIFEST libgtk3.manifest" >>$@
 
-gtk.def: libgtk-3.la
+gtk.def: libgtk-4.la
 	echo "LIBRARY libgtk-$(GTK_MAJOR_VERSION)-@LT_CURRENT_MINUS_AGE@" >$@
 	echo "EXPORTS" >>$@
 	objdump -p .libs/libgtk-$(GTK_MAJOR_VERSION)-@LT_CURRENT_MINUS_AGE@.dll | sed -n -e 's/\t\[\s\+\([0-9]\+\)\]\s\([A-Za-z_][A-Za-z0-9_]\)/\2/p' >>$@
@@ -1081,7 +1081,7 @@ gtk_use_quartz_private_h_sources = 	\
 	gtkquartz.h
 if USE_QUARTZ
 gtk_c_sources += $(gtk_use_quartz_c_sources)
-libgtk_3_la_CFLAGS = "-xobjective-c"
+libgtk_4_la_CFLAGS = "-xobjective-c"
 gtk_private_h_sources += $(gtk_use_quartz_private_h_sources)
 endif
 
@@ -1390,43 +1390,43 @@ gtktypefuncs.c: stamp-gtktypebuiltins.h stamp-gtkprivatetypebuiltins.h $(top_src
 gtktestutils.c: gtktypefuncs.c
 
 # target platform:
-lib_LTLIBRARIES = libgtk-3.la
+lib_LTLIBRARIES = libgtk-4.la
 
-gtkincludedir = $(includedir)/gtk-3.0/gtk
+gtkincludedir = $(includedir)/gtk-4.0/gtk
 gtkinclude_HEADERS = $(gtk_public_h_sources) $(gtk_semi_private_h_sources) $(gtk_built_public_sources) gtkversion.h
 
-a11yincludedir = $(includedir)/gtk-3.0/gtk/a11y
+a11yincludedir = $(includedir)/gtk-4.0/gtk/a11y
 a11yinclude_HEADERS= $(a11y_h_sources)
 
-deprecatedincludedir = $(includedir)/gtk-3.0/gtk/deprecated
+deprecatedincludedir = $(includedir)/gtk-4.0/gtk/deprecated
 deprecatedinclude_HEADERS= $(deprecated_h_sources)
 
-gtkunixprintincludedir = $(includedir)/gtk-3.0/unix-print/gtk
+gtkunixprintincludedir = $(includedir)/gtk-4.0/unix-print/gtk
 gtkunixprintinclude_HEADERS = $(gtk_unix_print_public_h_sources)
 
-nodist_libgtk_3_la_SOURCES = $(nodist_gtk_c_sources)
-libgtk_3_la_SOURCES = $(gtk_c_sources)
-libgtk_3_la_LDFLAGS = $(libtool_opts)
-libgtk_3_la_LIBADD = $(libadd)
-libgtk_3_la_DEPENDENCIES = $(deps)
+nodist_libgtk_4_la_SOURCES = $(nodist_gtk_c_sources)
+libgtk_4_la_SOURCES = $(gtk_c_sources)
+libgtk_4_la_LDFLAGS = $(libtool_opts)
+libgtk_4_la_LIBADD = $(libadd)
+libgtk_4_la_DEPENDENCIES = $(deps)
 
 if USE_WIN32
-libgtk_3_la_LIBADD += -lole32 -lgdi32 -lcomdlg32 -lwinspool -lcomctl32
-libgtk_3_la_LDFLAGS += -Wl,-luuid $(gtk_win32_res_ldflag)
-libgtk_3_la_DEPENDENCIES += $(gtk_win32_res)
+libgtk_4_la_LIBADD += -lole32 -lgdi32 -lcomdlg32 -lwinspool -lcomctl32
+libgtk_4_la_LDFLAGS += -Wl,-luuid $(gtk_win32_res_ldflag)
+libgtk_4_la_DEPENDENCIES += $(gtk_win32_res)
 endif
 
 install-exec-hook:
 if DISABLE_EXPLICIT_DEPS
-	$(SHELL) $(top_srcdir)/sanitize-la.sh $(DESTDIR)$(libdir)/libgtk-3.la
+	$(SHELL) $(top_srcdir)/sanitize-la.sh $(DESTDIR)$(libdir)/libgtk-4.la
 endif
 
 if USE_QUARTZ
 install-mac-key-theme:
-	$(MKDIR_P) $(DESTDIR)$(datadir)/themes/Mac/gtk-3.0
-	$(INSTALL_DATA) $(srcdir)/gtk-keys.css.mac $(DESTDIR)$(datadir)/themes/Mac/gtk-3.0/gtk-keys.css
+	$(MKDIR_P) $(DESTDIR)$(datadir)/themes/Mac/gtk-4.0
+	$(INSTALL_DATA) $(srcdir)/gtk-keys.css.mac $(DESTDIR)$(datadir)/themes/Mac/gtk-4.0/gtk-keys.css
 uninstall-mac-key-theme:
-	rm -f $(DESTDIR)$(datadir)/themes/Mac/gtk-3.0/gtk-keys.css
+	rm -f $(DESTDIR)$(datadir)/themes/Mac/gtk-4.0/gtk-keys.css
 else
 install-mac-key-theme:
 uninstall-mac-key-theme:
@@ -1435,27 +1435,27 @@ endif
 # ------------------- MSVC Build Items ----------------
 MSVCPROJS = gtk-3
 
-gtk_3_FILES = \
+gtk_4_FILES = \
 	$(gtk_base_c_sources)		\
 	$(gtk_os_win32_c_sources)	\
 	$(gtk_use_win32_c_sources)	\
 	$(gtk_dbus_built_sources)
 
-gtk_3_EXCLUDES = dummy
-gtk_3_HEADERS_DIR = $(gtkincludedir)
+gtk_4_EXCLUDES = dummy
+gtk_4_HEADERS_DIR = $(gtkincludedir)
 
-gtk_3_HEADERS_INST = \
+gtk_4_HEADERS_INST = \
 	$(gtkinclude_HEADERS)	\
 	$(a11y_h_sources)	\
 	$(deprecated_h_sources)
 
-gtk_3_HEADERS_EXCLUDES = dummy
+gtk_4_HEADERS_EXCLUDES = dummy
 
 include $(top_srcdir)/build/Makefile.msvcproj
 
 if HAVE_INTROSPECTION
 # Introspection Items for MSVC
-MSVC_INTROSPECT_GIRS = Gtk-3.0.gir
+MSVC_INTROSPECT_GIRS = Gtk-4.0.gir
 
 GTK_MSVC_GIR_CFLAGS =						\
 	$(GTK_BASE_CFLAGS_DEFINES)				\
@@ -1480,21 +1480,21 @@ GTK_MSVC_GIR_CFLAGS =						\
 	-I../.. -I../../gtk -I../../gdk
 
 INTROSPECTION_INTERMEDIATE_ITEMS = \
-	$(top_builddir)/build/win32/Gtk-3.0.gir.msvc.introspect		\
-	$(top_builddir)/build/win32/Gtk_3_0_gir_list
+	$(top_builddir)/build/win32/Gtk-4.0.gir.msvc.introspect		\
+	$(top_builddir)/build/win32/Gtk-4_0_gir_list
 
-Gtk_3_0_gir_MSVC_FILES =		\
+Gtk_4_0_gir_MSVC_FILES =		\
 	$(introspected_pub_headers)	\
 	$(gtk_base_c_sources)		\
 	$(gtk_os_win32_c_sources)	\
 	gtktypebuiltins.h		\
 	gtktypebuiltins.c
 
-Gtk_3_0_gir_MSVC_EXPORT_PACKAGES = $(Gtk_3_0_gir_EXPORT_PACKAGES)
-Gtk_3_0_gir_MSVC_INCLUDE_GIRS = Atk-1.0
-Gtk_3_0_gir_MSVC_LIBS = gtk-3.0 gdk-3.0
-Gtk_3_0_gir_MSVC_CFLAGS = $(GTK_MSVC_GIR_CFLAGS)
-Gtk_3_0_gir_MSVC_SCANNERFLAGS = --warn-all --add-include-path=. --include-uninstalled=./Gdk-3.0.gir
+Gtk_4_0_gir_MSVC_EXPORT_PACKAGES = $(Gtk_4_0_gir_EXPORT_PACKAGES)
+Gtk_4_0_gir_MSVC_INCLUDE_GIRS = Atk-1.0
+Gtk_4_0_gir_MSVC_LIBS = gtk-4.0 gdk-4.0
+Gtk_4_0_gir_MSVC_CFLAGS = $(GTK_MSVC_GIR_CFLAGS)
+Gtk_4_0_gir_MSVC_SCANNERFLAGS = --warn-all --add-include-path=. --include-uninstalled=./Gdk-4.0.gir
 
 include $(top_srcdir)/build/Makefile.msvc-introspection
 
@@ -1510,14 +1510,14 @@ dist-hook: \
 
 # Install a RC file for the default GTK+ theme, and key themes
 install-data-local: install-ms-lib install-def-file install-mac-key-theme
-	$(MKDIR_P) $(DESTDIR)$(datadir)/themes/Default/gtk-3.0
-	$(INSTALL_DATA) $(srcdir)/gtk-keys.css.default $(DESTDIR)$(datadir)/themes/Default/gtk-3.0/gtk-keys.css
-	$(MKDIR_P) $(DESTDIR)$(datadir)/themes/Emacs/gtk-3.0
-	$(INSTALL_DATA) $(srcdir)/gtk-keys.css.emacs $(DESTDIR)$(datadir)/themes/Emacs/gtk-3.0/gtk-keys.css
+	$(MKDIR_P) $(DESTDIR)$(datadir)/themes/Default/gtk-4.0
+	$(INSTALL_DATA) $(srcdir)/gtk-keys.css.default $(DESTDIR)$(datadir)/themes/Default/gtk-4.0/gtk-keys.css
+	$(MKDIR_P) $(DESTDIR)$(datadir)/themes/Emacs/gtk-4.0
+	$(INSTALL_DATA) $(srcdir)/gtk-keys.css.emacs $(DESTDIR)$(datadir)/themes/Emacs/gtk-4.0/gtk-keys.css
 
 uninstall-local: uninstall-ms-lib uninstall-def-file uninstall-mac-key-theme
-	rm -f $(DESTDIR)$(datadir)/themes/Default/gtk-3.0/gtk-keys.css
-	rm -f $(DESTDIR)$(datadir)/themes/Emacs/gtk-3.0/gtk-keys.css
+	rm -f $(DESTDIR)$(datadir)/themes/Default/gtk-4.0/gtk-keys.css
+	rm -f $(DESTDIR)$(datadir)/themes/Emacs/gtk-4.0/gtk-keys.css
 
 # if srcdir!=builddir, clean out maintainer-clean files from builddir
 # this allows dist to pass.
@@ -1549,23 +1549,23 @@ INTROSPECTION_COMPILER_ARGS = \
 	--includedir=. \
 	--includedir=../gdk
 
-Gtk-3.0.gir: $(INTROSPECTION_SCANNER) libgtk-3.la $(top_builddir)/gdk/Gdk-3.0.gir Makefile
-Gtk_3_0_gir_SCANNERFLAGS = 			\
+Gtk-4.0.gir: $(INTROSPECTION_SCANNER) libgtk-4.la $(top_builddir)/gdk/Gdk-4.0.gir Makefile
+Gtk_4_0_gir_SCANNERFLAGS = 			\
 	--warn-all				\
 	--add-include-path=$(top_builddir)/gdk	\
-	--include-uninstalled=$(top_builddir)/gdk/Gdk-3.0.gir
-Gtk_3_0_gir_INCLUDES = Atk-1.0
+	--include-uninstalled=$(top_builddir)/gdk/Gdk-4.0.gir
+Gtk_4_0_gir_INCLUDES = Atk-1.0
 if USE_X11
-Gtk_3_0_gir_SCANNERFLAGS += --add-include-path=$(top_builddir)/gdk/x11
-Gtk_3_0_gir_INCLUDES += xlib-2.0
+Gtk_4_0_gir_SCANNERFLAGS += --add-include-path=$(top_builddir)/gdk/x11
+Gtk_4_0_gir_INCLUDES += xlib-2.0
 endif
-Gtk_3_0_gir_CFLAGS = \
+Gtk_4_0_gir_CFLAGS = \
 		$(AM_CPPFLAGS) \
 		-DGTK_TEXT_USE_INTERNAL_UNSUPPORTED_API
-Gtk_3_0_gir_FILES = $(introspection_files)
-Gtk_3_0_gir_LIBS = libgtk-3.la $(top_builddir)/gdk/libgdk-3.la
-Gtk_3_0_gir_EXPORT_PACKAGES = gtk+-3.0
-INTROSPECTION_GIRS = Gtk-3.0.gir
+Gtk_4_0_gir_FILES = $(introspection_files)
+Gtk_4_0_gir_LIBS = libgtk-4.la $(top_builddir)/gdk/libgdk-4.la
+Gtk_4_0_gir_EXPORT_PACKAGES = gtk+-4.0
+INTROSPECTION_GIRS = Gtk-4.0.gir
 
 girdir = $(datadir)/gir-1.0
 gir_DATA = $(INTROSPECTION_GIRS)
@@ -1580,17 +1580,17 @@ endif
 # Installed tools
 #
 bin_PROGRAMS = \
-	gtk-query-immodules-3.0	\
+	gtk-query-immodules-4.0	\
 	gtk-update-icon-cache \
 	gtk-encode-symbolic-svg \
 	gtk-builder-tool \
 	gtk-query-settings \
 	gtk-launch
 
-gtk_query_immodules_3_0_SOURCES = queryimmodules.c gtkutils.c
-gtk_query_immodules_3_0_LDADD = 		\
-	libgtk-3.la				\
-	$(top_builddir)/gdk/libgdk-3.la		\
+gtk_query_immodules_4_0_SOURCES = queryimmodules.c gtkutils.c
+gtk_query_immodules_4_0_LDADD = 		\
+	libgtk-4.la				\
+	$(top_builddir)/gdk/libgdk-4.la		\
 	$(GMODULE_LIBS)				\
 	$(GTK_DEP_LIBS)
 
@@ -1600,25 +1600,25 @@ gtk_update_icon_cache_LDADD = $(GDK_PIXBUF_LIBS)
 gtk_encode_symbolic_svg_SOURCES = encodesymbolic.c
 gtk_encode_symbolic_svg_LDADD =			\
 	$(GDK_PIXBUF_LIBS)			\
-	$(top_builddir)/gdk/libgdk-3.la		\
+	$(top_builddir)/gdk/libgdk-4.la		\
 	$(GTK_DEP_LIBS)
 
 gtk_builder_tool_SOURCES = gtk-builder-tool.c
 gtk_builder_tool_LDADD =			\
-	libgtk-3.la				\
-	$(top_builddir)/gdk/libgdk-3.la		\
+	libgtk-4.la				\
+	$(top_builddir)/gdk/libgdk-4.la		\
 	$(GTK_DEP_LIBS)
 
 gtk_query_settings_SOURCES = gtk-query-settings.c
 gtk_query_settings_LDADD= 			\
-	libgtk-3.la				\
-	$(top_builddir)/gdk/libgdk-3.la		\
+	libgtk-4.la				\
+	$(top_builddir)/gdk/libgdk-4.la		\
 	$(GTK_DEP_LIBS)
 
 gtk_launch_SOURCES = gtk-launch.c
 gtk_launch_LDADD =				\
-	libgtk-3.la				\
-	$(top_builddir)/gdk/libgdk-3.la		\
+	libgtk-4.la				\
+	$(top_builddir)/gdk/libgdk-4.la		\
 	$(GTK_DEP_LIBS)
 
 if OS_WIN32

libgail-util/Makefile.am

@@ -3,7 +3,7 @@ include $(top_srcdir)/Makefile.decl
 EXTRA_DIST += gailutil.def
 if OS_WIN32
 export_symbols = -export-symbols $(srcdir)/gailutil.def
-gailutil.def: libgailutil-3.la
+gailutil.def: libgailutil-4.la
 	echo "LIBRARY libgailutil-$(GTK_MAJOR_VERSION)-$(GAIL_LT_CURRENT_MINUS_AGE)" >$@
 	echo "EXPORTS" >>$@
 	objdump -p .libs/libgailutil-$(GTK_MAJOR_VERSION)-$(GAIL_LT_CURRENT_MINUS_AGE).dll | sed -n -e 's/\t\[\s\+\([0-9]\+\)\]\s\([A-Za-z_][A-Za-z0-9_]\)/\2/p' >>$@
@@ -30,26 +30,26 @@ uninstall-ms-lib:
 endif
 
 
-lib_LTLIBRARIES = libgailutil-3.la
+lib_LTLIBRARIES = libgailutil-4.la
 
 util_c_sources =		\
 	gailmisc.c		\
 	gailtextutil.c
 
-libgailutilincludedir=$(includedir)/gail-3.0/libgail-util
+libgailutilincludedir=$(includedir)/gail-4.0/libgail-util
 
 util_public_h_sources =		\
 	gailmisc.h		\
 	gailtextutil.h		\
 	gail-util.h
 
-libgailutil_3_la_SOURCES = 	\
+libgailutil_4_la_SOURCES = 	\
 	$(util_c_sources)
 
 libgailutilinclude_HEADERS =	\
 	$(util_public_h_sources)
 
-libgailutil_3_la_CPPFLAGS = \
+libgailutil_4_la_CPPFLAGS = \
 	-I$(top_srcdir)		\
 	-I$(top_srcdir)/gdk	\
 	-I$(top_builddir)/gdk	\
@@ -59,39 +59,39 @@ libgailutil_3_la_CPPFLAGS = \
 	-DGDK_DISABLE_DEPRECATED\
 	-DGTK_DISABLE_DEPRECATED
 
-libgailutil_3_la_CFLAGS = \
+libgailutil_4_la_CFLAGS = \
 	$(GTK_DEP_CFLAGS)	\
 	$(GTK_DEBUG_FLAGS)	\
 	$(AM_CFLAGS)
 
-libgailutil_3_la_LIBADD = \
-	$(top_builddir)/gtk/libgtk-3.la	\
-	$(top_builddir)/gdk/libgdk-3.la	\
+libgailutil_4_la_LIBADD = \
+	$(top_builddir)/gtk/libgtk-4.la	\
+	$(top_builddir)/gdk/libgdk-4.la	\
 	$(GTK_DEP_LIBS)
 
-libgailutil_3_la_LDFLAGS = \
+libgailutil_4_la_LDFLAGS = \
 	-version-info $(GAIL_LT_VERSION_INFO)	\
 	$(no_undefined)				\
         $(LDFLAGS)
 
-gailutil.lib: libgailutil-3.la gailutil.def
-	lib -machine:@LIB_EXE_MACHINE_FLAG@ -name:libgailutil-3.0-$(GAIL_LT_CURRENT_MINUS_AGE).dll -def:gailutil.def -out:$@
+gailutil.lib: libgailutil-4.la gailutil.def
+	lib -machine:@LIB_EXE_MACHINE_FLAG@ -name:libgailutil-4.0-$(GAIL_LT_CURRENT_MINUS_AGE).dll -def:gailutil.def -out:$@
 
 install-data-local: install-ms-lib install-def-file
 
 uninstall-local: uninstall-ms-lib uninstall-def-file
 
 # ------------------- MSVC Build Items ----------------
-MSVCPROJS = gailutil-3
+MSVCPROJS = gailutil-4
 
-gailutil_3_FILES = $(libgailutil_3_la_SOURCES)
+gailutil_4_FILES = $(libgailutil_4_la_SOURCES)
 
-gailutil_3_EXCLUDES = dummy
-gailutil_3_HEADERS_DIR = $(libgailutilincludedir)
+gailutil_4_EXCLUDES = dummy
+gailutil_4_HEADERS_DIR = $(libgailutilincludedir)
 
-gailutil_3_HEADERS_INST = $(libgailutilinclude_HEADERS)
+gailutil_4_HEADERS_INST = $(libgailutilinclude_HEADERS)
 
-gailutil_3_HEADERS_EXCLUDES = dummy
+gailutil_4_HEADERS_EXCLUDES = dummy
 
 include $(top_srcdir)/build/Makefile.msvcproj
 

modules/input/Makefile.am

@@ -13,13 +13,13 @@ AM_CPPFLAGS = \
 	$(INCLUDED_IMMODULE_DEFINE)
 
 DEPS = \
-	$(top_builddir)/gtk/libgtk-3.la
+	$(top_builddir)/gtk/libgtk-4.la
 
 LDADDS = \
-	$(top_builddir)/gtk/libgtk-3.la	\
+	$(top_builddir)/gtk/libgtk-4.la	\
 	$(GTK_DEP_LIBS)
 
-moduledir = $(libdir)/gtk-3.0/$(GTK_BINARY_VERSION)/immodules
+moduledir = $(libdir)/gtk-4.0/$(GTK_BINARY_VERSION)/immodules
 
 im_xim_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module $(no_undefined)
 im_xim_la_SOURCES = 		\
@@ -190,7 +190,7 @@ else
 MULTIPRESS_MODULE = im-multipress.la
 endif
 
-imconffiledir = $(sysconfdir)/gtk-3.0
+imconffiledir = $(sysconfdir)/gtk-4.0
 dist_imconffile_DATA = im-multipress.conf
 
 if CROSS_COMPILING
@@ -207,21 +207,21 @@ endif
 # after the libraries are installed in their final locations.
 install-data-hook:
 	$(AM_V_GEN) if $(RUN_QUERY_IMMODULES_TEST) ; then \
-	  echo $(mkinstalldirs) $(DESTDIR)$(libdir)/gtk-3.0/3.0.0 ; \
-	  $(mkinstalldirs) $(DESTDIR)$(libdir)/gtk-3.0/3.0.0 ; \
-	  echo "$(top_builddir)/gtk/gtk-query-immodules-3.0$(EXEEXT) > $(DESTDIR)$(libdir)/gtk-3.0/3.0.0/immodules.cache" ; \
-	  $(top_builddir)/gtk/gtk-query-immodules-3.0$(EXEEXT) > $(DESTDIR)$(libdir)/gtk-3.0/3.0.0/immodules.cache ; \
+	  echo $(mkinstalldirs) $(DESTDIR)$(libdir)/gtk-4.0/4.0.0 ; \
+	  $(mkinstalldirs) $(DESTDIR)$(libdir)/gtk-4.0/4.0.0 ; \
+	  echo "$(top_builddir)/gtk/gtk-query-immodules-4.0$(EXEEXT) > $(DESTDIR)$(libdir)/gtk-4.0/4.0.0/immodules.cache" ; \
+	  $(top_builddir)/gtk/gtk-query-immodules-4.0$(EXEEXT) > $(DESTDIR)$(libdir)/gtk-4.0/4.0.0/immodules.cache ; \
 	else \
 	  echo "***" ; \
 	  echo "*** Warning: immodules.cache not built" ; \
 	  echo "***" ; \
 	  echo "*** Generate this file manually on host" ; \
-	  echo "*** system using gtk-query-immodules-3.0" ; \
+	  echo "*** system using gtk-query-immodules-4.0" ; \
 	  echo "***" ; \
         fi
 
 uninstall-local:
-	rm -f $(DESTDIR)$(libdir)/gtk-3.0/3.0.0/immodules.cache
+	rm -f $(DESTDIR)$(libdir)/gtk-4.0/4.0.0/immodules.cache
 
 if BUILD_DYNAMIC_MODULES
 
@@ -262,7 +262,7 @@ noinst_LTLIBRARIES =				\
 included-modules: $(noinst_LTLIBRARIES)
 
 immodules.cache: Makefile.am $(module_LTLIBRARIES)
-	$(AM_V_GEN) $(top_builddir)/gtk/gtk-query-immodules-3.0$(EXEEXT) $(module_LTLIBRARIES) > immodules.cache
+	$(AM_V_GEN) $(top_builddir)/gtk/gtk-query-immodules-4.0$(EXEEXT) $(module_LTLIBRARIES) > immodules.cache
 
 EXTRA_DIST += README.multipress
 

modules/printbackends/cloudprint/Makefile.am

@@ -1,6 +1,6 @@
 include $(top_srcdir)/Makefile.decl
 
-backenddir = $(libdir)/gtk-3.0/$(GTK_BINARY_VERSION)/printbackends
+backenddir = $(libdir)/gtk-4.0/$(GTK_BINARY_VERSION)/printbackends
 
 backend_LTLIBRARIES = libprintbackend-cloudprint.la
 
@@ -32,7 +32,7 @@ libprintbackend_cloudprint_la_LDFLAGS =  \
 	-avoid-version -module $(no_undefined)
 
 libprintbackend_cloudprint_la_LIBADD =			\
-	$(top_builddir)/gtk/libgtk-3.la			\
+	$(top_builddir)/gtk/libgtk-4.la			\
 	$(REST_LIBS)					\
 	$(JSON_GLIB_LIBS)				\
 	$(GTK_DEP_LIBS)

modules/printbackends/cups/Makefile.am

@@ -14,11 +14,11 @@ AM_CPPFLAGS = \
 	$(GTK_DEBUG_FLAGS)
 
 LDADDS = \
-	$(top_builddir)/gtk/libgtk-3.la	\
+	$(top_builddir)/gtk/libgtk-4.la	\
 	$(COLORD_LIBS)			\
 	$(GTK_DEP_LIBS)
 
-backenddir = $(libdir)/gtk-3.0/$(GTK_BINARY_VERSION)/printbackends
+backenddir = $(libdir)/gtk-4.0/$(GTK_BINARY_VERSION)/printbackends
 
 backend_LTLIBRARIES = libprintbackend-cups.la
 

modules/printbackends/file/Makefile.am

@@ -1,6 +1,6 @@
 include $(top_srcdir)/Makefile.decl
 
-backenddir = $(libdir)/gtk-3.0/$(GTK_BINARY_VERSION)/printbackends
+backenddir = $(libdir)/gtk-4.0/$(GTK_BINARY_VERSION)/printbackends
 
 backend_LTLIBRARIES = libprintbackend-file.la
 
@@ -25,7 +25,7 @@ libprintbackend_file_la_LDFLAGS =  \
 	-avoid-version -module $(no_undefined)
 
 libprintbackend_file_la_LIBADD = \
-	$(top_builddir)/gtk/libgtk-3.la	\
+	$(top_builddir)/gtk/libgtk-4.la	\
 	$(GTK_DEP_LIBS)
 
 noinst_HEADERS =			\

modules/printbackends/lpr/Makefile.am

@@ -11,10 +11,10 @@ AM_CPPFLAGS = \
 	$(GTK_DEBUG_FLAGS)
 
 LDADDS = \
-	$(top_builddir)/gtk/libgtk-3.la	\
+	$(top_builddir)/gtk/libgtk-4.la	\
 	$(GTK_DEP_LIBS)
 
-backenddir = $(libdir)/gtk-3.0/$(GTK_BINARY_VERSION)/printbackends
+backenddir = $(libdir)/gtk-4.0/$(GTK_BINARY_VERSION)/printbackends
 
 backend_LTLIBRARIES = libprintbackend-lpr.la
 

modules/printbackends/papi/Makefile.am

@@ -11,10 +11,10 @@ AM_CPPFLAGS = \
 	$(GTK_DEBUG_FLAGS)
 
 LDADDS = \
-	$(top_builddir)/gtk/libgtk-3.la	\
+	$(top_builddir)/gtk/libgtk-4.la	\
 	$(GTK_DEP_LIBS)
 
-backenddir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/printbackends
+backenddir = $(libdir)/gtk-4.0/$(GTK_BINARY_VERSION)/printbackends
 
 backend_LTLIBRARIES = libprintbackend-papi.la
 

modules/printbackends/test/Makefile.am

@@ -1,6 +1,6 @@
 include $(top_srcdir)/Makefile.decl
 
-backenddir = $(libdir)/gtk-3.0/$(GTK_BINARY_VERSION)/printbackends
+backenddir = $(libdir)/gtk-4.0/$(GTK_BINARY_VERSION)/printbackends
 
 backend_LTLIBRARIES = libprintbackend-test.la
 
@@ -24,7 +24,7 @@ libprintbackend_test_la_LDFLAGS =  \
 	-avoid-version -module $(no_undefined)
 
 libprintbackend_test_la_LIBADD = \
-	$(top_builddir)/gtk/libgtk-3.la	\
+	$(top_builddir)/gtk/libgtk-4.la	\
 	$(GTK_DEP_LIBS)
 
 noinst_HEADERS =			\

tests/Makefile.am

@@ -12,11 +12,11 @@ AM_CPPFLAGS =				\
 	$(GDK_DEP_CFLAGS)
 
 DEPS = \
-	$(top_builddir)/gtk/libgtk-3.la
+	$(top_builddir)/gtk/libgtk-4.la
 
 LDADD = \
-	$(top_builddir)/gtk/libgtk-3.la	\
-	$(top_builddir)/gdk/libgdk-3.la	\
+	$(top_builddir)/gtk/libgtk-4.la	\
+	$(top_builddir)/gdk/libgdk-4.la	\
 	$(GTK_DEP_LIBS)			\
 	$(GDK_DEP_LIBS)			\
 	-lm

tests/visuals/Makefile.am

@@ -9,11 +9,11 @@ AM_CPPFLAGS =				\
 AM_CXXFLAGS = $(AM_CPPFLAGS)
 
 DEPS = \
-	$(top_builddir)/gtk/libgtk-3.la
+	$(top_builddir)/gtk/libgtk-4.la
 
 LDADDS = \
-	$(top_builddir)/gtk/libgtk-3.la	\
-	$(top_builddir)/gdk/libgdk-3.la	\
+	$(top_builddir)/gtk/libgtk-4.la	\
+	$(top_builddir)/gdk/libgdk-4.la	\
 	$(GTK_DEP_LIBS)			\
 	-lm
 

testsuite/a11y/Makefile.am

@@ -16,8 +16,8 @@ AM_CPPFLAGS =				\
 	$(GTK_DEP_CFLAGS)
 
 LDADD = \
-	$(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)
 
 # work around random file systems showing up in the file chooser,

testsuite/a11y/state/Makefile.am

@@ -13,8 +13,8 @@ AM_CPPFLAGS =                           \
         $(GTK_DEP_CFLAGS)
 
 LDADD = \
-        $(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)
 
 TESTS_ENVIRONMENT =                     \

testsuite/css/Makefile.am

@@ -18,8 +18,8 @@ AM_CPPFLAGS =				\
 	$(GTK_DEP_CFLAGS)
 
 LDADD = \
-	$(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)
 
 TEST_PROGS += api

testsuite/css/nodes/Makefile.am

@@ -18,8 +18,8 @@ test_css_nodes_CFLAGS = \
 	$(NULL)
 
 test_css_nodes_LDADD = \
-	$(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)			\
 	$(NULL)
 

testsuite/css/parser/Makefile.am

@@ -19,8 +19,8 @@ test_css_parser_CFLAGS = \
        	$(GTK_DEP_CFLAGS)
 
 test_css_parser_LDADD = \
-       	$(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)
 
 test_css_parser_SOURCES = \

testsuite/css/style/Makefile.am

@@ -18,8 +18,8 @@ test_css_style_CFLAGS = \
 	$(NULL)
 
 test_css_style_LDADD = \
-        $(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)			\
 	$(NULL)
 

testsuite/gtk/Makefile.am

@@ -17,11 +17,11 @@ AM_CPPFLAGS += -DHAVE_UNIX_PRINT_WIDGETS
 endif
 
 DEPS = \
-	$(top_builddir)/gtk/libgtk-3.la
+	$(top_builddir)/gtk/libgtk-4.la
 
 LDADD = \
-	$(top_builddir)/gtk/libgtk-3.la	\
-	$(top_builddir)/gdk/libgdk-3.la	\
+	$(top_builddir)/gtk/libgtk-4.la	\
+	$(top_builddir)/gdk/libgdk-4.la	\
 	$(GTK_DEP_LIBS)
 
 noinst_PROGRAMS = $(TEST_PROGS)

testsuite/reftests/Makefile.am

@@ -24,8 +24,8 @@ gtk_reftest_CFLAGS = \
 
 gtk_reftest_LDADD = \
 	libgtkreftestprivate.la		\
-	$(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)			\
 	$(GMODULE_LIBS)			\
 	$(NULL)
@@ -44,8 +44,8 @@ endif
 libgtkreftestprivate_la_CFLAGS = $(gtk_reftest_CFLAGS)
 libgtkreftestprivate_la_LDFLAGS = $(no_undefined)
 libgtkreftestprivate_la_LIBADD =	\
-	$(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)			\
 	$(GMODULE_LIBS)			\
 	$(NULL)