Rename Makefile references from 3.0 to 4.0

This is almost certainly incomplete.
Needs careful scrutiny

7 files changed, 84 insertions, 84 deletions

diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index 052d4876d3..e1b6d81386 100644
--- a/gdk/Makefile.am
+++ b/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
-
-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)
-
-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 =	\
+	$(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_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_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
 
diff --git a/gdk/broadway/Makefile.am b/gdk/broadway/Makefile.am
index f1c392353f..ff793a7d82 100644
--- a/gdk/broadway/Makefile.am
+++ b/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\"		\
diff --git a/gdk/mir/Makefile.am b/gdk/mir/Makefile.am
index 71b6e37210..654b8f9bb8 100644
--- a/gdk/mir/Makefile.am
+++ b/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\" \
diff --git a/gdk/quartz/Makefile.am b/gdk/quartz/Makefile.am
index 18fdbd3355..9bd34ef441 100644
--- a/gdk/quartz/Makefile.am
+++ b/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\"		\
diff --git a/gdk/wayland/Makefile.am b/gdk/wayland/Makefile.am
index 5b2e64e11b..127e091b00 100644
--- a/gdk/wayland/Makefile.am
+++ b/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\"			\
diff --git a/gdk/win32/Makefile.am b/gdk/win32/Makefile.am
index 991bf708cb..8d73e22889 100644
--- a/gdk/win32/Makefile.am
+++ b/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\"		\
diff --git a/gdk/x11/Makefile.am b/gdk/x11/Makefile.am
index 6289f3ac79..c23352091a 100644
--- a/gdk/x11/Makefile.am
+++ b/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\"		\