Merge branch 'ebassi/no-more-autotools-redux' into 'gtk-3-24'

Drop the Autotools build

See merge request GNOME/gtk!5299

12 files changed, 11 insertions, 2132 deletions

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
deleted file mode 100644
index 946e72febc..0000000000
--- a/gtk/Makefile.am
+++ /dev/null
@@ -1,749 +0,0 @@
-AUTOMAKE_OPTIONS = subdir-objects
-
-include $(top_srcdir)/Makefile.decl
-
-GTK_BASE_CFLAGS_DEFINES =				\
-	-DG_LOG_USE_STRUCTURED=1			\
-	-DGTK_VERSION=\"$(GTK_VERSION)\"		\
-	-DGTK_BINARY_VERSION=\"$(GTK_BINARY_VERSION)\"	\
-	-DGTK_COMPILATION				\
-	-DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED
-
-GTK_PLAT_CFLAGS_DEFINES =				\
-	-DGTK_LIBDIR=\"$(libdir)\"			\
-	-DGTK_LOCALEDIR=\"$(localedir)\"		\
-	-DGTK_DATADIR=\"$(datadir)\"			\
-	-DGTK_DATA_PREFIX=\"$(prefix)\"			\
-	-DGTK_SYSCONFDIR=\"$(sysconfdir)\"		\
-	-DGTK_HOST=\"$(host)\"				\
-	-DGTK_PRINT_BACKENDS=\"$(GTK_PRINT_BACKENDS)\"
-
-AM_CPPFLAGS =						\
-	-DG_LOG_DOMAIN=\"Gtk\"				\
-	$(GTK_BASE_CFLAGS_DEFINES)			\
-	$(GTK_PLAT_CFLAGS_DEFINES)			\
-	-DX11_DATA_PREFIX=\"$(X11_PREFIX)\"		\
-	-DISO_CODES_PREFIX=\"$(ISO_CODES_PREFIX)\"	\
-	-I$(top_builddir)				\
-	-I$(top_builddir)/gtk				\
-	-I$(top_srcdir) 				\
-	-I$(top_srcdir)/gdk				\
-	$(GMODULE_CFLAGS)				\
-	$(GTK_DEBUG_FLAGS)				\
-	$(GTK_DEP_CFLAGS)				\
-	$(INCLUDED_IMMODULE_DEFINE)
-
-if OS_WIN32
-gtk_def = gtk.def
-gtk_win32_symbols = -export-symbols $(srcdir)/gtk.def
-
-gtk_win32_res = gtk-win32-res.o
-gtk_win32_res_ldflag = -Wl,gtk-win32-res.o
-
-gtk-win32-res.o : gtk-win32.rc libgtk3.manifest
-	$(WINDRES) gtk-win32.rc $@
-
-gtk-win32.rc: gtk-win32.rc.body
-	cat $< >>$@
-	echo "ISOLATIONAWARE_MANIFEST_RESOURCE_ID RT_MANIFEST libgtk3.manifest" >>$@
-
-gtk.def: libgtk-3.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' >>$@
-
-install-def-file: gtk.def
-	$(INSTALL) gtk.def $(DESTDIR)$(libdir)/gtk-win32-3.0.def
-uninstall-def-file:
-	-rm $(DESTDIR)$(libdir)/gtk-win32-3.0.def
-else
-install-def-file:
-uninstall-def-file:
-endif
-
-if MS_LIB_AVAILABLE
-noinst_DATA = gtk-win32-$(GTK_API_VERSION).lib
-
-gtk-win32-$(GTK_API_VERSION).lib: libgtk-3.la gtk.def
-	lib -machine:@LIB_EXE_MACHINE_FLAG@ -name:libgtk-win32-$(GTK_API_VERSION)-@LT_CURRENT_MINUS_AGE@.dll -def:gtk.def -out:$@
-
-install-ms-lib:
-	$(INSTALL) gtk-win32-$(GTK_API_VERSION).lib $(DESTDIR)$(libdir)
-
-uninstall-ms-lib:
-	-rm $(DESTDIR)$(libdir)/gtk-win32-$(GTK_API_VERSION).lib
-else
-install-ms-lib:
-uninstall-ms-lib:
-endif
-
-libadd = 				\
-	$(top_builddir)/gdk/libgdk-3.la	\
-	$(GMODULE_LIBS) 		\
-	$(GTK_DEP_LIBS)
-deps = 					\
-	$(top_builddir)/gdk/libgdk-3.la
-
-# libtool stuff: set version and export symbols for resolving
-# since automake doesn't support conditionalized libsomething_la_LDFLAGS
-# we use the general approach here
-libtool_opts =							\
-  $(GTK_LINK_FLAGS)						\
-  -version-info $(LT_VERSION_INFO)				\
-  -export-dynamic $(no_undefined)				\
-  -rpath $(libdir)
-
-
-included-modules:
-if HAVE_INCLUDED_IMMMODULES
-	@cd $(top_builddir)/modules/input && $(MAKE) $(AM_MAKEFLAGS) included-modules
-
-libadd += $(INCLUDED_IMMODULE_OBJ)
-deps += $(INCLUDED_IMMODULE_OBJ)
-
-$(INCLUDED_IMMODULE_OBJ): included-modules
-	@true
-endif
-
-.PHONY: included-modules
-
-#
-# setup source file variables
-#
-
-include $(srcdir)/a11y/Makefile.inc
-include $(srcdir)/deprecated/Makefile.inc
-include $(srcdir)/inspector/Makefile.inc
-include $(srcdir)/gtk-sources.inc
-
-# GTK+ header files for public installation (non-generated, or generated
-# by configure)
-
-gtk_public_h_sources = $(GTK_PUB_HDRS)
-
-if OS_UNIX
-gtk_unix_print_public_h_sources = $(GTK_UNIX_PRINT_PUB_HDRS)
-endif
-
-gtk_private_type_h_sources = $(GTK_PRIVATE_TYPE_HDRS)
-
-# GTK+ header files that don't get installed
-gtk_private_h_sources =		\
-	$(inspector_h_sources)	\
-	$(gtk_private_type_h_sources) \
-	$(gtk_base_private_h_sources)
-
-# GTK+ C sources to build the library from
-gtk_base_c_sources = 		\
-	$(a11y_c_sources)	\
-	$(gtk_deprecated_c_sources)	\
-	$(inspector_c_sources)	\
-	$(gtk_base_c_sources_base)
-
-if USE_QUARTZ
-gtk_base_c_sources += $(gtk_clipboard_dnd_c_sources_quartz)
-else
-gtk_base_c_sources += $(gtk_clipboard_dnd_c_sources_generic)
-endif
-
-nodist_gtk_c_sources =
-gtk_c_sources = $(gtk_base_c_sources)
-
-$(gtk_dbus_built_sources) : Makefile.am gtkdbusinterfaces.xml
-	$(AM_V_GEN) gdbus-codegen \
-	--interface-prefix org.Gtk. \
-	--c-namespace _Gtk \
-	--generate-c-code gtkdbusgenerated \
-	$(srcdir)/gtkdbusinterfaces.xml
-
-nodist_gtk_c_sources += $(gtk_dbus_built_sources)
-
-gtk_os_unix_c_sources = $(gtk_os_unix_c_sources_base)
-
-if OS_UNIX
-gtk_private_h_sources += $(gtk_os_unix_private_h_sources)
-
-if HAVE_TRACKER3
-gtk_private_h_sources += $(gtk_os_unix_tracker3_private_h_sources)
-gtk_os_unix_c_sources += $(gtk_os_unix_tracker3_c_sources)
-endif
-
-gtk_c_sources += $(gtk_os_unix_c_sources)
-endif
-
-if OS_WIN32
-gtk_private_h_sources += $(gtk_os_win32_private_h_sources)
-gtk_c_sources += $(gtk_os_win32_c_sources)
-endif
-
-if USE_X11
-gtk_c_sources += $(gtk_use_x11_c_sources)
-gtk_private_h_sources += $(gtk_use_x11_private_h_sources)
-endif
-
-if USE_WAYLAND
-gtk_c_sources += $(gtk_use_wayland_c_sources)
-endif
-
-# pretty tricky way to write USE_WAYLAND || USE_X11...
-if USE_WAYLAND
-gtk_c_sources += $(gtk_use_wayland_or_x11_c_sources)
-else
-if USE_X11
-gtk_c_sources += $(gtk_use_wayland_or_x11_c_sources)
-else
-endif
-endif
-
-if USE_WIN32
-gtk_c_sources += $(gtk_use_win32_c_sources)
-gtk_private_h_sources += $(gtk_use_win32_private_h_sources)
-endif
-
-if USE_QUARTZ
-gtk_c_sources += $(gtk_use_quartz_c_sources)
-gtk_private_h_sources += $(gtk_use_quartz_private_h_sources)
-endif
-
-gtk_all_private_h_sources = \
-	$(a11y_private_h_sources) \
-	$(gtk_deprecated_private_h_sources) \
-	$(gtk_private_h_sources) \
-	$(gtk_use_x11_private_h_sources) \
-	$(gtk_use_win32_private_h_sources) \
-	$(gtk_use_quartz_private_h_sources)
-
-if !USE_X11
-if !USE_WIN32
-if !USE_QUARTZ
-gtk_c_sources += $(gtk_use_stub_c_sources)
-endif
-endif
-endif
-
-# we use our own built_sources variable rules to avoid automake's
-# BUILT_SOURCES oddities
-# we generate frequently rebuild files piggyback on a stamp file, so sources
-# depending on them only get rebuild when the built source actually changed
-# content
-
-gtk_built_sources =				\
-	$(gtk_built_private_headers)		\
-	$(gtk_built_public_sources)		\
-	$(gtk_other_built_sources)
-
-nodist_gtk_c_sources += $(gtk_built_sources)
-
-stamp_files =					\
-	stamp-gtkmarshalers.h			\
-	stamp-gtktypebuiltins.h			\
-	stamp-gtkprivatetypebuiltins.h
-
-#
-# setup GTK+ sources and their dependencies
-#
-MAINTAINERCLEANFILES = \
-	$(gtk_built_sources) 			\
-	$(gtk_dbus_built_sources)		\
-	$(print_portal_built_sources)		\
-	$(stamp_files)
-
-DISTCLEANFILES = gtktypefuncs.inc
-
-if OS_WIN32
-DISTCLEANFILES += gtk-win32.rc
-endif
-
-EXTRA_DIST += $(gtk_all_private_h_sources) $(gtk_extra_sources)
-
-# We need to dist this for `make distcheck`, apparently...
-EXTRA_DIST += gtk.gresource.xml
-
-
-pkgdatadir = $(datadir)/gtk-$(GTK_API_VERSION)
-pkgdata_DATA = gtkbuilder.rng
-
-EXTRA_DIST += gtkbuilder.rnc gtkbuilder.rng
-
-itsdir = $(datadir)/gettext/its
-its_DATA = gtkbuilder.loc gtkbuilder.its
-
-EXTRA_DIST += $(its_DATA)
-
-templates =				\
-	$(inspector_templates)		\
-	$(gtk_base_ui_templates)
-
-#
-# rules to generate built sources
-#
-# setup autogeneration dependencies
-gen_sources = xgen-gdef xgen-gtbh xgen-gtic xgen-gmh xgen-gmc xgen-gmlh xgen-gmlc xgen-gtfsrc.c xgen-gtf
-CLEANFILES = $(gen_sources)
-
-BUILT_SOURCES = \
-	$(gtk_built_sources) \
-	$(gtk_dbus_built_sources) \
-	$(print_portal_built_sources)
-
-# all autogenerated files need to be generated in the srcdir,
-# so old versions get remade and are not confused with newer
-# versions in the build dir. thus a development setup requires
-# srcdir to be writable, passing --disable-rebuilds to
-# ../configure will supress all autogeneration rules.
-gtkmarshalers.h: stamp-gtkmarshalers.h
-	@true
-stamp-gtkmarshalers.h: gtkmarshalers.list
-	$(AM_V_GEN) $(GLIB_GENMARSHAL) \
-		--prefix=_gtk_marshal \
-		--header \
-		--valist-marshallers \
-		$(srcdir)/gtkmarshalers.list >> xgen-gmlh \
-	&& (cmp -s xgen-gmlh gtkmarshalers.h || cp xgen-gmlh gtkmarshalers.h) \
-	&& rm -f xgen-gmlh \
-	&& echo timestamp > $(@F)
-gtkmarshalers.c: gtkmarshalers.list
-	$(AM_V_GEN) (echo "#undef G_ENABLE_DEBUG"; \
-	 $(GLIB_GENMARSHAL) \
-	 	--prefix=_gtk_marshal \
-		--body \
-		--valist-marshallers $(srcdir)/gtkmarshalers.list) >> xgen-gmlc \
-	&& cp xgen-gmlc gtkmarshalers.c \
-	&& rm -f xgen-gmlc
-
-gtktypebuiltins.h: stamp-gtktypebuiltins.h
-	@true
-stamp-gtktypebuiltins.h: $(gtk_public_h_sources) $(a11y_h_sources) $(gtk_deprecated_h_sources) gtktypebuiltins.h.template
-	$(AM_V_GEN) ( cd $(srcdir) && $(GLIB_MKENUMS) --template gtktypebuiltins.h.template \
-		$(gtk_public_h_sources) $(a11y_h_sources) $(gtk_deprecated_h_sources) ) > xgen-gtbh \
-	&& (cmp -s xgen-gtbh gtktypebuiltins.h || cp xgen-gtbh gtktypebuiltins.h ) \
-	&& rm -f xgen-gtbh \
-	&& echo timestamp > $(@F)
-gtktypebuiltins.c: $(gtk_public_h_sources) $(a11y_h_sources) $(gtk_deprecated_h_sources) gtktypebuiltins.c.template
-	$(AM_V_GEN) ( cd $(srcdir) && $(GLIB_MKENUMS) --template gtktypebuiltins.c.template \
-		$(gtk_public_h_sources) $(a11y_h_sources) $(gtk_deprecated_h_sources) ) > xgen-gtbc \
-	&& cp xgen-gtbc gtktypebuiltins.c  \
-	&& rm -f xgen-gtbc
-
-gtk.gresource.xml: Makefile.am inspector/Makefile.inc
-	$(AM_V_GEN) echo "<?xml version='1.0' encoding='UTF-8'?>" > $@; \
-	echo "<gresources>" >> $@; \
-	echo "  <gresource prefix='/org/gtk/libgtk'>" >> $@; \
-        echo "    <file>theme/Adwaita/gtk.css</file>" >> $@; \
-        echo "    <file>theme/Adwaita/gtk-dark.css</file>" >> $@; \
-        echo "    <file>theme/Adwaita/gtk-contained.css</file>" >> $@; \
-        echo "    <file>theme/Adwaita/gtk-contained-dark.css</file>" >> $@; \
-        for f in $(srcdir)/theme/Adwaita/assets/*.png; do \
-          n=`basename $$f`; \
-          echo "    <file preprocess='to-pixdata'>theme/Adwaita/assets/$$n</file>" >> $@; \
-        done; \
-        for f in $(srcdir)/theme/Adwaita/assets/*.svg; do \
-          n=`basename $$f`; \
-          echo "    <file>theme/Adwaita/assets/$$n</file>" >> $@; \
-        done; \
-	echo "    <file>theme/HighContrast/gtk.css</file>" >> $@; \
-	echo "    <file alias='theme/HighContrastInverse/gtk.css'>theme/HighContrast/gtk-inverse.css</file>" >> $@; \
-	echo "    <file>theme/HighContrast/gtk-contained.css</file>" >> $@; \
-	echo "    <file>theme/HighContrast/gtk-contained-inverse.css</file>" >> $@; \
-	      for f in $(srcdir)/theme/HighContrast/assets/*.png; do \
-          n=`basename $$f`; \
-          echo "    <file preprocess='to-pixdata'>theme/HighContrast/assets/$$n</file>" >> $@; \
-        done; \
-        for f in $(srcdir)/theme/HighContrast/assets/*.svg; do \
-          n=`basename $$f`; \
-          echo "    <file>theme/HighContrast/assets/$$n</file>" >> $@; \
-        done; \
-	echo "    <file>theme/win32/gtk-win32-base.css</file>" >> $@; \
-	echo "    <file>theme/win32/gtk.css</file>" >> $@; \
-	for f in $(srcdir)/cursor/*.png; do \
-	  n=`basename $$f`; \
-	  echo "    <file>cursor/$$n</file>" >> $@; \
-	done; \
-	for f in $(srcdir)/gesture/*.symbolic.png; do \
-	  n=`basename $$f`; \
-	  echo "    <file alias='icons/64x64/actions/$$n'>gesture/$$n</file>" >> $@; \
-	done; \
-	for f in $(srcdir)/ui/*.ui; do \
-	  n=`basename $$f`; \
-	  echo "    <file preprocess='xml-stripblanks'>ui/$$n</file>" >> $@; \
-	done; \
-	for s in 16x16 22x22 24x24 32x32 48x48; do \
-	  for c in actions status categories; do \
-	    for f in $(srcdir)/icons/$$s/$$c/*.png; do \
-	      test "$$f" = "$(srcdir)/icons/$$s/$$c/*.png" && continue; \
-	      n=`basename $$f`; \
-	      echo "    <file>icons/$$s/$$c/$$n</file>" >> $@; \
-	    done; \
-	  done; \
-	done; \
-	for s in scalable; do \
-	  for c in status; do \
-	    for f in $(srcdir)/icons/$$s/$$c/*.svg; do \
-	      test "$$f" = "$(srcdir)/icons/$$s/$$c/*.svg" && continue; \
-	      n=`basename $$f`; \
-	      echo "    <file>icons/$$s/$$c/$$n</file>" >> $@; \
-	    done; \
-	  done; \
-	done; \
-	for f in $(srcdir)/inspector/*.ui; do \
-	  n=`basename $$f`; \
-	  echo "    <file compressed='true' preprocess='xml-stripblanks'>inspector/$$n</file>" >> $@; \
-	done; \
-	echo "    <file>inspector/logo.png</file>" >> $@; \
-	for f in $(srcdir)/emoji/*.data; do \
-	  n=`basename $$f`; \
-	  echo "    <file>emoji/$$n</file>" >> $@; \
-	done; \
-	echo "  </gresource>" >> $@; \
-	echo "</gresources>" >> $@;
-
-adwaita_theme_scss = \
-	$(adwaita_theme_scss_sources)	\
-	$()
-
-highcontrast_theme_scss = \
-	$(highcontrast_theme_scss_sources)	\
-	$()
-
-if REBUILD_SCSS
-# If we have sassc then we can rebuild the theme CSS as soon as the SCSS
-# files have been changed
-
-scss_verbose = $(scss_verbose_@AM_V@)
-scss_verbose_ = $(scss_verbose_@AM_DEFAULT_V@)
-scss_verbose_0 = @echo "  SCSS     $@";
-
-SASSC_OPTS = -a -M -t compact
-
-theme/Adwaita/gtk-contained.css: $(top_srcdir)/gtk/theme/Adwaita/gtk-contained.scss $(adwaita_theme_scss)
-	$(scss_verbose) $(MKDIR_P) $(dir $@) && $(SASSC) $(SASSC_OPTS) $< $@ || rm -f $@
-
-theme/Adwaita/gtk-contained-dark.css: $(top_srcdir)/gtk/theme/Adwaita/gtk-contained-dark.scss $(adwaita_theme_scss)
-	$(scss_verbose) $(MKDIR_P) $(dir $@) && $(SASSC) $(SASSC_OPTS) $< $@ || rm -f $@
-
-theme/HighContrast/gtk-contained.css: $(top_srcdir)/gtk/theme/HighContrast/gtk-contained.scss $(highcontrast_theme_scss)
-	$(scss_verbose) $(MKDIR_P) $(dir $@) && $(SASSC) $(SASSC_OPTS) $< $@ || rm -f $@
-
-theme/HighContrast/gtk-contained-inverse.css: $(top_srcdir)/gtk/theme/HighContrast/gtk-contained-inverse.scss $(highcontrast_theme_scss)
-	$(scss_verbose) $(MKDIR_P) $(dir $@) && $(SASSC) $(SASSC_OPTS) $< $@ || rm -f $@
-
-endif # REBUILD_SCSS
-
-theme_sources = 				\
-	$(win32_theme_css_sources)	\
-	$(adwaita_theme_scss)			\
-	$(adwaita_theme_files) 		\
-	$(highcontrast_theme_scss)		\
-	$(highcontrast_theme_css_sources)
-
-resource_files = $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(builddir)/gtk.gresource.xml)
-
-gtkresources.h: gtk.gresource.xml
-	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< \
-		--target=$@ --sourcedir=$(srcdir) --c-name _gtk --generate-header --manual-register --internal
-gtkresources.c: gtk.gresource.xml $(resource_files)
-	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< \
-		--target=$@ --sourcedir=$(srcdir) --c-name _gtk --generate-source --manual-register --internal
-
-gtkprivatetypebuiltins.h: stamp-gtkprivatetypebuiltins.h
-	@true
-stamp-gtkprivatetypebuiltins.h: $(gtk_private_type_h_sources) gtkprivatetypebuiltins.h.template
-	$(AM_V_GEN) ( cd $(srcdir) && $(GLIB_MKENUMS) --template gtkprivatetypebuiltins.h.template \
-		$(gtk_private_type_h_sources) ) > xgen-gptbh \
-	&& (cmp -s xgen-gptbh gtkprivatetypebuiltins.h || cp xgen-gptbh gtkprivatetypebuiltins.h ) \
-	&& rm -f xgen-gptbh \
-	&& echo timestamp > $(@F)
-gtkprivatetypebuiltins.c: $(gtk_private_type_h_sources)  gtkprivatetypebuiltins.c.template
-	$(AM_V_GEN) ( cd $(srcdir) && $(GLIB_MKENUMS) --template gtkprivatetypebuiltins.c.template \
-		$(gtk_private_type_h_sources) ) > xgen-gptbc \
-	&& cp xgen-gptbc gtkprivatetypebuiltins.c  \
-	&& rm -f xgen-gptbc
-
-
-gtktypefuncs.inc: stamp-gtktypebuiltins.h stamp-gtkprivatetypebuiltins.h $(top_srcdir)/gtk/*.h $(top_srcdir)/gtk/a11y/*.h $(top_srcdir)/gtk/deprecated/*.h $(top_srcdir)/gdk/*.h Makefile
-	$(AM_V_GEN) export LC_ALL=C ; \
-	  (echo '#undef GTK_COMPILATION' && echo '#include <gtk/gtkx.h>') > xgen-gtfsrc.c && \
-	  echo 'G_GNUC_BEGIN_IGNORE_DEPRECATIONS' > xgen-gtf && \
-	  ${CPP} $(DEFS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) xgen-gtfsrc.c | \
-	  $(GREP) -o '\bg[td]k_[a-zA-Z0-9_]*_get_type\b' | \
-	  sort | uniq | \
-	  $(SED) '{ s/^/*tp++ = /; s/$$/();/; s/^.*\(gdk_x11\|gtk_plug_\|gtk_socket_\).*$$/#ifdef GDK_WINDOWING_X11\n&\n#endif/; }' >> xgen-gtf \
-	&& cp xgen-gtf $@ && rm -f xgen-gtf
-$(srcdir)/gtktestutils.c: gtktypefuncs.inc
-
-# target platform:
-lib_LTLIBRARIES = libgtk-3.la
-
-gtkincludedir = $(includedir)/gtk-3.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
-a11yinclude_HEADERS= $(a11y_h_sources)
-
-deprecatedincludedir = $(includedir)/gtk-3.0/gtk/deprecated
-deprecatedinclude_HEADERS= $(gtk_deprecated_h_sources)
-
-gtkunixprintincludedir = $(includedir)/gtk-3.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_CFLAGS = $(AM_CFLAGS) $(GDK_HIDDEN_VISIBILITY_CFLAGS)
-libgtk_3_la_LDFLAGS = $(libtool_opts)
-libgtk_3_la_LIBADD = $(libadd)
-libgtk_3_la_DEPENDENCIES = $(deps)
-
-if USE_QUARTZ
-libgtk_3_la_CFLAGS += "-xobjective-c"
-endif
-
-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)
-endif
-
-install-exec-hook:
-if DISABLE_EXPLICIT_DEPS
-	$(SHELL) $(top_srcdir)/sanitize-la.sh $(DESTDIR)$(libdir)/libgtk-3.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
-uninstall-mac-key-theme:
-	rm -f $(DESTDIR)$(datadir)/themes/Mac/gtk-3.0/gtk-keys.css
-else
-install-mac-key-theme:
-uninstall-mac-key-theme:
-endif
-
-# ------------------- MSVC Build Items ----------------
-MSVCPROJS = gtk-3
-
-gtk_3_FILES = \
-	$(gtk_base_c_sources)		\
-	$(gtk_os_win32_c_sources)	\
-	$(gtk_use_win32_c_sources)
-
-gtk_3_EXCLUDES = dummy
-
-include $(top_srcdir)/win32/Makefile.msvcproj
-
-dist-hook: \
-	$(top_builddir)/win32/vs9/gtk-3.vcproj
-
-# 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
-
-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
-
-# if srcdir!=builddir, clean out maintainer-clean files from builddir
-# this allows dist to pass.
-distclean-local:
-	if test $(srcdir) != .; then \
-	  rm -f $(MAINTAINERCLEANFILES); \
-	fi
-
-if HAVE_INTROSPECTION
-introspected_pub_headers = $(filter-out %private.h gtktextdisplay.h gtktextlayout.h gtkx.h, $(gtkinclude_HEADERS) $(a11yinclude_HEADERS) $(deprecatedinclude_HEADERS))
-
-introspection_files = \
-    $(introspected_pub_headers) \
-    $(filter-out %win32.c, $(gtk_base_c_sources)) \
-    gtkprintoperation-unix.c \
-    gtktypebuiltins.h \
-    gtktypebuiltins.c
-
-if USE_X11
-introspection_files += \
-    gtksocket.c \
-    gtkplug.c
-endif
-
-include $(INTROSPECTION_MAKEFILE)
-INTROSPECTION_SCANNER_ENV = CC="$(CC)"
-INTROSPECTION_COMPILER_ARGS = \
-	--includedir=$(srcdir) \
-	--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 = 			\
-	--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
-Gtk_3_0_gir_C_INCLUDES = gtk/gtk.h gtk/gtk-a11y.h
-if USE_X11
-Gtk_3_0_gir_SCANNERFLAGS += --add-include-path=$(top_builddir)/gdk/x11
-Gtk_3_0_gir_INCLUDES += xlib-2.0
-Gtk_3_0_gir_C_INCLUDES += gtk/gtkx.h
-endif
-Gtk_3_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
-
-girdir = $(datadir)/gir-1.0
-gir_DATA = $(INTROSPECTION_GIRS)
-
-typelibsdir = $(libdir)/girepository-1.0
-typelibs_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
-
-CLEANFILES += $(gir_DATA) $(typelibs_DATA)
-endif
-
-#
-# Installed tools
-#
-bin_PROGRAMS = \
-	gtk-query-immodules-3.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		\
-	$(GMODULE_LIBS)				\
-	$(GTK_DEP_LIBS)
-
-gtk_update_icon_cache_SOURCES = updateiconcache.c
-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		\
-	$(GTK_DEP_LIBS)
-
-gtk_builder_tool_SOURCES = gtk-builder-tool.c
-gtk_builder_tool_LDADD =			\
-	libgtk-3.la				\
-	$(top_builddir)/gdk/libgdk-3.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		\
-	$(GTK_DEP_LIBS)
-
-gtk_launch_SOURCES = gtk-launch.c
-gtk_launch_LDADD =				\
-	libgtk-3.la				\
-	$(top_builddir)/gdk/libgdk-3.la		\
-	$(GTK_DEP_LIBS)
-
-if OS_WIN32
-
-# Workaround for UAC silliness: programs with "update" in their name
-# are believed to be installers and require elevated privileges to be
-# used... Embed a manifest file into executable to tell Windows that
-# gtk-update-icon-cache.exe doesn't require any special privileges.
-
-GTK_UPDATE_ICON_CACHE_MANIFEST = gtk-update-icon-cache.exe.manifest
-GTK_UPDATE_ICON_CACHE_RC = gtk-update-icon-cache.rc
-GTK_UPDATE_ICON_CACHE_MANIFEST_OBJECT = gtk-update-icon-cache_manifest.o
-
-$(GTK_UPDATE_ICON_CACHE_MANIFEST): Makefile generate-uac-manifest.py
-	$(PYTHON) $(srcdir)/generate-uac-manifest.py -p=gtk3 -n=gtk-update-icon-cache --pkg-version=$(GTK_VERSION) --output-dir=$(builddir)
-
-$(GTK_UPDATE_ICON_CACHE_RC): $(GTK_UPDATE_ICON_CACHE_MANIFEST)
-
-$(GTK_UPDATE_ICON_CACHE_MANIFEST_OBJECT): $(GTK_UPDATE_ICON_CACHE_RC) $(GTK_UPDATE_ICON_CACHE_MANIFEST)
-	$(WINDRES) --input $< --output $@ --output-format=coff
-
-gtk_update_icon_cache_LDADD += $(GTK_UPDATE_ICON_CACHE_MANIFEST_OBJECT)
-
-endif
-
-.PHONY: files
-
-files:
-	@files=`ls $(DISTFILES) 2> /dev/null `; for p in $$files; do \
-	  echo $$p; \
-	done
-
-gsettings_SCHEMAS = \
-	org.gtk.Settings.FileChooser.gschema.xml \
-	org.gtk.Settings.ColorChooser.gschema.xml \
-	org.gtk.Settings.EmojiChooser.gschema.xml \
-	org.gtk.Settings.Debug.gschema.xml
-
-@GSETTINGS_RULES@
-
-EXTRA_DIST +=                   \
-	$(resource_files)	\
-	$(gesture_sources)	\
-	$(theme_sources)	\
-	$(gsettings_SCHEMAS)	\
-	compose/compose-parse.py	\
-	emoji/convert-emoji.c	\
-	emoji/gresource.xml.in	\
-	emoji/README.md	\
-	emoji/de.data	\
-	emoji/en.data	\
-	emoji/es.data	\
-	emoji/fr.data	\
-	emoji/zh.data	\
-	a11y/Makefile.inc	\
-	deprecated/Makefile.inc	\
-	glade/README.glade	\
-	glade/gtk-private-widgets.xml \
-	compose/gtk-compose-lookaside.txt \
-	inspector/Makefile.inc	\
-	libgtk3.manifest.in	\
-	gtk-win32.rc.body.in	\
-	gtk-win32.rc.body	\
-	gtkwin32embed.h		\
-	gtkwin32embedwidget.h	\
-	gtkwin32embedwidget.c	\
-	gtkprint-win32.h	\
-	gtkprint-win32.c	\
-	gtksearchenginetracker3.c \
-	gtksearchenginetracker3.h \
-	gtksearchenginequartz.h \
-	gtkdbusinterfaces.xml	\
-	gtk-keys.css.default	\
-	gtk-keys.css.emacs	\
-	gtk-keys.css.mac	\
-	makefile.msc		\
-	makefile.msc.in		\
-	gtktypebuiltins.c.template \
-	gtktypebuiltins.h.template \
-	gtkprivatetypebuiltins.c.template \
-	gtkprivatetypebuiltins.h.template \
-	meson.build \
-	gen-gtk-gresources-xml.py \
-	gen-rc.py \
-	generate-uac-manifest.py \
-	gentypefuncs.py \
-	a11y/meson.build \
-	deprecated/meson.build \
-	inspector/meson.build \
-	theme/Adwaita/meson.build \
-	theme/Adwaita/parse-sass.sh \
-	theme/Adwaita/render-assets.sh \
-	theme/HighContrast/assets.svg \
-	theme/HighContrast/assets.txt \
-	theme/HighContrast/meson.build \
-	theme/HighContrast/parse-sass.sh \
-	theme/HighContrast/render-assets.sh
-
-
--include $(top_srcdir)/git.mk
diff --git a/gtk/a11y/Makefile.inc b/gtk/a11y/Makefile.inc
deleted file mode 100644
index c116a1f131..0000000000
--- a/gtk/a11y/Makefile.inc
+++ /dev/null
@@ -1,135 +0,0 @@
-a11y_h_sources =				\
-	a11y/gtk-a11y-autocleanups.h		\
-	a11y/gtkarrowaccessible.h		\
-	a11y/gtkbooleancellaccessible.h		\
-	a11y/gtkbuttonaccessible.h		\
-	a11y/gtkcellaccessible.h		\
-	a11y/gtkcellaccessibleparent.h		\
-	a11y/gtkcheckmenuitemaccessible.h	\
-	a11y/gtkcomboboxaccessible.h		\
-	a11y/gtkcontaineraccessible.h		\
-	a11y/gtkcontainercellaccessible.h	\
-	a11y/gtkentryaccessible.h		\
-	a11y/gtkexpanderaccessible.h		\
-	a11y/gtkfilechooserwidgetaccessible.h	\
-	a11y/gtkflowboxaccessible.h		\
-	a11y/gtkflowboxchildaccessible.h	\
-	a11y/gtkframeaccessible.h		\
-	a11y/gtkheaderbaraccessible.h	        \
-	a11y/gtkiconviewaccessible.h		\
-	a11y/gtkimageaccessible.h		\
-	a11y/gtkimagecellaccessible.h		\
-	a11y/gtklabelaccessible.h		\
-	a11y/gtklevelbaraccessible.h 		\
-	a11y/gtklinkbuttonaccessible.h		\
-	a11y/gtklistboxaccessible.h		\
-	a11y/gtklistboxrowaccessible.h		\
-	a11y/gtklockbuttonaccessible.h		\
-	a11y/gtkmenuaccessible.h		\
-	a11y/gtkmenubuttonaccessible.h		\
-	a11y/gtkmenuitemaccessible.h		\
-	a11y/gtkmenushellaccessible.h		\
-	a11y/gtknotebookaccessible.h		\
-	a11y/gtknotebookpageaccessible.h	\
-	a11y/gtkpanedaccessible.h		\
-	a11y/gtkplugaccessible.h		\
-	a11y/gtkpopoveraccessible.h		\
-	a11y/gtkprogressbaraccessible.h		\
-	a11y/gtkradiobuttonaccessible.h		\
-	a11y/gtkradiomenuitemaccessible.h	\
-	a11y/gtkrangeaccessible.h		\
-	a11y/gtkrenderercellaccessible.h	\
-	a11y/gtkscaleaccessible.h		\
-	a11y/gtkscalebuttonaccessible.h		\
-	a11y/gtkscrolledwindowaccessible.h	\
-	a11y/gtksocketaccessible.h		\
-	a11y/gtkspinbuttonaccessible.h		\
-	a11y/gtkspinneraccessible.h		\
-	a11y/gtkstatusbaraccessible.h		\
-	a11y/gtkstackaccessible.h 		\
-	a11y/gtkswitchaccessible.h		\
-	a11y/gtktextcellaccessible.h		\
-	a11y/gtktextviewaccessible.h		\
-	a11y/gtktogglebuttonaccessible.h	\
-	a11y/gtktoplevelaccessible.h		\
-	a11y/gtktreeviewaccessible.h		\
-	a11y/gtkwidgetaccessible.h		\
-	a11y/gtkwindowaccessible.h
-
-a11y_private_h_sources =			\
-	a11y/gtkaccessibility.h			\
-	a11y/gtkaccessibilitymisc.h		\
-	a11y/gtkaccessibilityutil.h		\
-	a11y/gtkcellaccessibleprivate.h		\
-	a11y/gtkcolorswatchaccessibleprivate.h	\
-	a11y/gtkcontaineraccessibleprivate.h	\
-	a11y/gtkiconviewaccessibleprivate.h	\
-	a11y/gtklabelaccessibleprivate.h	\
-	a11y/gtkflowboxaccessibleprivate.h	\
-	a11y/gtklistboxaccessibleprivate.h	\
-	a11y/gtklockbuttonaccessibleprivate.h	\
-	a11y/gtkstackaccessibleprivate.h 	\
-	a11y/gtktextviewaccessibleprivate.h	\
-	a11y/gtktreeviewaccessibleprivate.h	\
-	a11y/gtkwidgetaccessibleprivate.h
-
-a11y_c_sources =				\
-	a11y/gtkaccessibility.c			\
-	a11y/gtkaccessibilitymisc.c 		\
-	a11y/gtkaccessibilityutil.c		\
-	a11y/gtkarrowaccessible.c		\
-	a11y/gtkbooleancellaccessible.c		\
-	a11y/gtkbuttonaccessible.c		\
-	a11y/gtkcellaccessible.c		\
-	a11y/gtkcellaccessibleparent.c		\
-	a11y/gtkcheckmenuitemaccessible.c	\
-	a11y/gtkcolorswatchaccessible.c		\
-	a11y/gtkcomboboxaccessible.c		\
-	a11y/gtkcontaineraccessible.c		\
-	a11y/gtkcontainercellaccessible.c	\
-	a11y/gtkentryaccessible.c		\
-	a11y/gtkexpanderaccessible.c		\
-	a11y/gtkfilechooserwidgetaccessible.c	\
-	a11y/gtkflowboxaccessible.c		\
-	a11y/gtkflowboxchildaccessible.c	\
-	a11y/gtkframeaccessible.c		\
-	a11y/gtkheaderbaraccessible.c	        \
-	a11y/gtkiconviewaccessible.c		\
-	a11y/gtkimageaccessible.c		\
-	a11y/gtkimagecellaccessible.c		\
-	a11y/gtklabelaccessible.c		\
-	a11y/gtklevelbaraccessible.c		\
-	a11y/gtklinkbuttonaccessible.c		\
-	a11y/gtklistboxaccessible.c		\
-	a11y/gtklistboxrowaccessible.c		\
-	a11y/gtklockbuttonaccessible.c		\
-	a11y/gtkmenuaccessible.c		\
-	a11y/gtkmenubuttonaccessible.c		\
-	a11y/gtkmenushellaccessible.c		\
-	a11y/gtkmenuitemaccessible.c		\
-	a11y/gtknotebookaccessible.c		\
-	a11y/gtknotebookpageaccessible.c	\
-	a11y/gtkpanedaccessible.c		\
-	a11y/gtkplugaccessible.c		\
-	a11y/gtkpopoveraccessible.c		\
-	a11y/gtkprogressbaraccessible.c		\
-	a11y/gtkradiobuttonaccessible.c		\
-	a11y/gtkradiomenuitemaccessible.c	\
-	a11y/gtkrangeaccessible.c		\
-	a11y/gtkrenderercellaccessible.c	\
-	a11y/gtkscaleaccessible.c		\
-	a11y/gtkscalebuttonaccessible.c		\
-	a11y/gtkscrolledwindowaccessible.c	\
-	a11y/gtksocketaccessible.c		\
-	a11y/gtkspinbuttonaccessible.c		\
-	a11y/gtkspinneraccessible.c		\
-	a11y/gtkstatusbaraccessible.c		\
-	a11y/gtkstackaccessible.c		\
-	a11y/gtkswitchaccessible.c		\
-	a11y/gtktextcellaccessible.c		\
-	a11y/gtktextviewaccessible.c		\
-	a11y/gtktogglebuttonaccessible.c	\
-	a11y/gtktoplevelaccessible.c		\
-	a11y/gtktreeviewaccessible.c		\
-	a11y/gtkwidgetaccessible.c		\
-	a11y/gtkwindowaccessible.c
diff --git a/gtk/a11y/gtkcellaccessibleparent.c b/gtk/a11y/gtkcellaccessibleparent.c
index bb0590c1ee..319a8426ee 100644
--- a/gtk/a11y/gtkcellaccessibleparent.c
+++ b/gtk/a11y/gtkcellaccessibleparent.c
@@ -23,7 +23,7 @@
 GType
 gtk_cell_accessible_parent_get_type (void)
 {
-  static volatile gsize g_define_type_id__volatile = 0;
+  static gsize g_define_type_id__volatile = 0;
 
   if (g_once_init_enter (&g_define_type_id__volatile))
     {
diff --git a/gtk/deprecated/Makefile.inc b/gtk/deprecated/Makefile.inc
deleted file mode 100644
index d1cdc5cdce..0000000000
--- a/gtk/deprecated/Makefile.inc
+++ /dev/null
@@ -1,90 +0,0 @@
-gtk_deprecated_h_sources = 		\
-	deprecated/gtkactivatable.h	\
-	deprecated/gtkaction.h		\
-	deprecated/gtkactiongroup.h	\
-	deprecated/gtkalignment.h	\
-	deprecated/gtkarrow.h		\
-	deprecated/gtkcolorsel.h	\
-	deprecated/gtkcolorseldialog.h	\
-	deprecated/gtkfontsel.h		\
-	deprecated/gtkgradient.h	\
-	deprecated/gtkhandlebox.h	\
-	deprecated/gtkhbbox.h		\
-	deprecated/gtkhbox.h		\
-	deprecated/gtkhpaned.h		\
-	deprecated/gtkhscale.h		\
-	deprecated/gtkhscrollbar.h	\
-	deprecated/gtkhseparator.h	\
-	deprecated/gtkhsv.h		\
-	deprecated/gtkiconfactory.h	\
-	deprecated/gtkimagemenuitem.h	\
-	deprecated/gtkmisc.h		\
-	deprecated/gtknumerableicon.h	\
-	deprecated/gtkradioaction.h	\
-	deprecated/gtkrc.h		\
-	deprecated/gtkrecentaction.h	\
-	deprecated/gtkstatusicon.h	\
-	deprecated/gtkstock.h		\
-	deprecated/gtkstyle.h		\
-	deprecated/gtkstyleproperties.h	\
-	deprecated/gtksymboliccolor.h	\
-	deprecated/gtktable.h		\
-	deprecated/gtktearoffmenuitem.h	\
-	deprecated/gtkthemingengine.h	\
-	deprecated/gtktoggleaction.h	\
-	deprecated/gtkuimanager.h	\
-	deprecated/gtkvbbox.h		\
-	deprecated/gtkvbox.h		\
-	deprecated/gtkvscale.h		\
-	deprecated/gtkvscrollbar.h	\
-	deprecated/gtkvseparator.h	\
-	deprecated/gtkvpaned.h
-
-gtk_deprecated_private_h_sources =		\
-	deprecated/gtkgradientprivate.h		\
-	deprecated/gtkiconfactoryprivate.h	\
-	deprecated/gtknumerableiconprivate.h	\
-	deprecated/gtkstylepropertiesprivate.h	\
-	deprecated/gtksymboliccolorprivate.h
-
-gtk_deprecated_c_sources = 			\
-	deprecated/gtkactivatable.c	\
-	deprecated/gtkaction.c		\
-	deprecated/gtkactiongroup.c	\
-	deprecated/gtkalignment.c	\
-	deprecated/gtkarrow.c		\
-	deprecated/gtkcolorsel.c	\
-	deprecated/gtkcolorseldialog.c	\
-	deprecated/gtkfontsel.c		\
-	deprecated/gtkgradient.c	\
-	deprecated/gtkhandlebox.c	\
-	deprecated/gtkhbbox.c		\
-	deprecated/gtkhbox.c		\
-	deprecated/gtkhpaned.c		\
-	deprecated/gtkhscale.c		\
-	deprecated/gtkhscrollbar.c	\
-	deprecated/gtkhseparator.c	\
-	deprecated/gtkhsv.c		\
-	deprecated/gtkiconfactory.c	\
-	deprecated/gtkimagemenuitem.c	\
-	deprecated/gtkmisc.c		\
-	deprecated/gtknumerableicon.c	\
-	deprecated/gtkradioaction.c	\
-	deprecated/gtkrc.c		\
-	deprecated/gtkrecentaction.c	\
-	deprecated/gtkstatusicon.c	\
-	deprecated/gtkstock.c		\
-	deprecated/gtkstyle.c		\
-	deprecated/gtkstyleproperties.c	\
-	deprecated/gtksymboliccolor.c	\
-	deprecated/gtktable.c		\
-	deprecated/gtktearoffmenuitem.c	\
-	deprecated/gtkthemingengine.c	\
-	deprecated/gtktoggleaction.c	\
-	deprecated/gtkuimanager.c	\
-	deprecated/gtkvbbox.c		\
-	deprecated/gtkvbox.c		\
-	deprecated/gtkvscale.c		\
-	deprecated/gtkvscrollbar.c	\
-	deprecated/gtkvseparator.c	\
-	deprecated/gtkvpaned.c
diff --git a/gtk/gtk-sources.inc b/gtk/gtk-sources.inc
deleted file mode 100644
index a073ada426..0000000000
--- a/gtk/gtk-sources.inc
+++ /dev/null
@@ -1,1066 +0,0 @@
-# List of headers to be passed into glib-mkenums
-
-
-# GTK+ header files for public installation (non-generated, or generated
-# by configure)
-
-GTK_PUB_HDRS = 		\
-	gtk.h			\
-	gtk-autocleanups.h	\
-	gtkx.h			\
-	gtkx-autocleanups.h	\
-	gtk-a11y.h		\
-	gtkaboutdialog.h	\
-	gtkaccelgroup.h		\
-	gtkaccellabel.h		\
-	gtkaccelmap.h		\
-	gtkaccessible.h		\
-	gtkactionable.h		\
-	gtkactionbar.h		\
-	gtkadjustment.h		\
-	gtkappchooser.h		\
-	gtkappchooserbutton.h	\
-	gtkappchooserdialog.h	\
-	gtkappchooserwidget.h	\
-	gtkapplication.h	\
-	gtkapplicationwindow.h	\
-	gtkaspectframe.h	\
-	gtkassistant.h		\
-	gtkbbox.h		\
-	gtkbin.h		\
-	gtkbindings.h		\
-	gtkborder.h		\
-	gtkbox.h		\
-	gtkbuilder.h		\
-	gtkbuildable.h		\
-	gtkbutton.h		\
-	gtkcalendar.h		\
-	gtkcellarea.h		\
-	gtkcellareacontext.h	\
-	gtkcellareabox.h	\
-	gtkcelleditable.h	\
-	gtkcelllayout.h		\
-	gtkcellrenderer.h	\
-	gtkcellrendereraccel.h	\
-	gtkcellrenderercombo.h	\
-	gtkcellrendererpixbuf.h	\
-	gtkcellrendererprogress.h \
-	gtkcellrendererspin.h	\
-	gtkcellrendererspinner.h\
-	gtkcellrenderertext.h	\
-	gtkcellrenderertoggle.h	\
-	gtkcellview.h		\
-	gtkcheckbutton.h	\
-	gtkcheckmenuitem.h	\
-	gtkclipboard.h		\
-	gtkcolorbutton.h	\
-	gtkcolorchooser.h	\
-	gtkcolorchooserwidget.h	\
-	gtkcolorchooserdialog.h	\
-	gtkcolorutils.h		\
-	gtkcombobox.h		\
-	gtkcomboboxtext.h	\
-	gtkcontainer.h		\
-	gtkcssprovider.h	\
-	gtkcsssection.h 	\
-	gtkdebug.h		\
-	gtkdialog.h		\
-	gtkdnd.h		\
-	gtkdragdest.h		\
-	gtkdragsource.h		\
-	gtkdrawingarea.h	\
-	gtkeditable.h		\
-	gtkentry.h		\
-	gtkentrybuffer.h	\
-	gtkentrycompletion.h	\
-	gtkenums.h		\
-	gtkeventbox.h		\
-	gtkeventcontroller.h	\
-	gtkeventcontrollerkey.h	\
-	gtkeventcontrollermotion.h	\
-	gtkeventcontrollerscroll.h	\
-	gtkexpander.h		\
-	gtkfilechooser.h	\
-	gtkfilechooserbutton.h	\
-	gtkfilechooserdialog.h	\
-	gtkfilechoosernative.h	\
-	gtkfilechooserwidget.h	\
-	gtkfilefilter.h		\
-	gtkfixed.h		\
-	gtkflowbox.h		\
-	gtkfontbutton.h		\
-	gtkfontchooser.h	\
-	gtkfontchooserdialog.h  \
-	gtkfontchooserwidget.h	\
-	gtkframe.h		\
-	gtkgesture.h		\
-	gtkgesturedrag.h	\
-	gtkgesturelongpress.h	\
-	gtkgesturemultipress.h	\
-	gtkgesturepan.h		\
-	gtkgesturerotate.h	\
-	gtkgesturesingle.h	\
-	gtkgesturestylus.h	\
-	gtkgestureswipe.h	\
-	gtkgesturezoom.h	\
-	gtkglarea.h		\
-	gtkgrid.h		\
-	gtkheaderbar.h		\
-	gtkicontheme.h		\
-	gtkiconview.h		\
-	gtkimage.h		\
-	gtkimcontext.h		\
-	gtkimcontextinfo.h	\
-	gtkimcontextsimple.h	\
-	gtkimmodule.h		\
-	gtkimmulticontext.h	\
-	gtkinfobar.h		\
-	gtkinvisible.h		\
-	gtklabel.h		\
-	gtklayout.h		\
-	gtklevelbar.h		\
-	gtklinkbutton.h		\
-	gtklistbox.h		\
-	gtkliststore.h		\
-	gtklockbutton.h		\
-	gtkmain.h		\
-	gtkmenu.h		\
-	gtkmenubar.h		\
-	gtkmenubutton.h		\
-	gtkmenuitem.h		\
-	gtkmenushell.h		\
-	gtkmenutoolbutton.h	\
-	gtkmessagedialog.h	\
-	gtkmodelbutton.h	\
-	gtkmodules.h		\
-	gtkmountoperation.h	\
-	gtknativedialog.h	\
-	gtknotebook.h		\
-	gtkoffscreenwindow.h	\
-	gtkorientable.h		\
-	gtkoverlay.h		\
-	gtkpadcontroller.h	\
-	gtkpagesetup.h		\
-	gtkpaned.h		\
-	gtkpapersize.h		\
-	gtkplacessidebar.h	\
-	gtkplug.h		\
-	gtkpopover.h		\
-	gtkpopovermenu.h	\
-	gtkprintcontext.h	\
-	gtkprintoperation.h	\
-	gtkprintoperationpreview.h \
-	gtkprintsettings.h	\
-	gtkprogressbar.h	\
-	gtkradiobutton.h	\
-	gtkradiomenuitem.h	\
-	gtkradiotoolbutton.h	\
-	gtkrange.h		\
-	gtkrecentchooser.h	\
-	gtkrecentchooserdialog.h \
-	gtkrecentchoosermenu.h	\
-	gtkrecentchooserwidget.h \
-	gtkrecentfilter.h	\
-	gtkrecentmanager.h	\
-	gtkrender.h		\
-	gtkrevealer.h		\
-	gtkscale.h		\
-	gtkscalebutton.h	\
-	gtkscrollable.h		\
-	gtkscrollbar.h		\
-	gtkscrolledwindow.h	\
-	gtksearchbar.h		\
-	gtksearchentry.h	\
-	gtkselection.h		\
-	gtkseparator.h		\
-	gtkseparatormenuitem.h	\
-	gtkseparatortoolitem.h	\
-	gtksettings.h		\
-	gtkshortcutlabel.h	\
-	gtkshortcutsgroup.h	\
-	gtkshortcutssection.h	\
-	gtkshortcutsshortcut.h	\
-	gtkshortcutswindow.h	\
-	gtkshow.h		\
-	gtkstacksidebar.h	\
-	gtksizegroup.h		\
-	gtksizerequest.h	\
-	gtksocket.h		\
-	gtkspinbutton.h		\
-	gtkspinner.h		\
-	gtkstack.h		\
-	gtkstackswitcher.h	\
-	gtkstatusbar.h		\
-	gtkstylecontext.h	\
-	gtkstyleprovider.h	\
-	gtkswitch.h		\
-	gtktestutils.h		\
-	gtktextattributes.h	\
-	gtktextbuffer.h		\
-	gtktextbufferrichtext.h	\
-	gtktextchild.h		\
-	gtktextdisplay.h	\
-	gtktextiter.h		\
-	gtktextmark.h		\
-	gtktexttag.h		\
-	gtktexttagtable.h	\
-	gtktextview.h		\
-	gtktogglebutton.h	\
-	gtktoggletoolbutton.h	\
-	gtktoolbar.h		\
-	gtktoolbutton.h		\
-	gtktoolitem.h		\
-	gtktoolitemgroup.h	\
-	gtktoolpalette.h	\
-	gtktoolshell.h		\
-	gtktooltip.h		\
-	gtktreednd.h		\
-	gtktreemodel.h		\
-	gtktreemodelfilter.h	\
-	gtktreemodelsort.h	\
-	gtktreeselection.h	\
-	gtktreesortable.h	\
-	gtktreestore.h		\
-	gtktreeview.h		\
-	gtktreeviewcolumn.h	\
-	gtktypes.h		\
-	gtkviewport.h		\
-	gtkvolumebutton.h	\
-	gtkwidget.h		\
-	gtkwidgetpath.h		\
-	gtkwindow.h		\
-	gtkwindowgroup.h
-
-GTK_PRIVATE_TYPE_HDRS =	\
-	gtkcsstypesprivate.h	\
-	gtktexthandleprivate.h
-
-GTK_UNIX_PRINT_PUB_HDRS = 	\
-	gtkpagesetupunixdialog.h	\
-	gtkprintunixdialog.h		\
-	gtkprinter.h			\
-	gtkprintjob.h			\
-	gtkunixprint-autocleanups.h	\
-	gtkunixprint.h
-
-# Installed header files without compatibility guarantees
-# that are not included in gtk/gtk.h
-gtk_semi_private_h_sources = \
-	gtktextlayout.h
-
-# Base non-generated private headers
-gtk_base_private_h_sources =	\
-	gtkactionmuxer.h	\
-	gtkactionobserver.h	\
-	gtkactionobservable.h	\
-	gtkadjustmentprivate.h	\
-	gtkapplicationaccelsprivate.h	\
-	gtkapplicationprivate.h	\
-	gtkaccelgroupprivate.h	\
-	gtkaccelmapprivate.h	\
-	gtkactionhelper.h	\
-	gtkallocatedbitmaskprivate.h	\
-	gtkappchooserprivate.h	\
-	gtkbindingsprivate.h	\
-	gtkbitmaskprivate.h	\
-	gtkbitmaskprivateimpl.h	\
-	gtkbookmarksmanager.h	\
-	gtkboxprivate.h         \
-	gtkboxgadgetprivate.h	\
-	gtkbuilderprivate.h	\
-	gtkbuiltiniconprivate.h	\
-	gtkbuttonprivate.h	\
-	gtkcairoblurprivate.h	\
-	gtkcellareaboxcontextprivate.h	\
-	gtkcheckbuttonprivate.h	\
-	gtkcheckmenuitemprivate.h	\
-	gtkclipboardprivate.h		\
-	gtkcolorswatchprivate.h	\
-	gtkcoloreditorprivate.h	\
-	gtkcolorpickerprivate.h	\
-	gtkcolorpickerkwinprivate.h	\
-	gtkcolorpickerportalprivate.h	\
-	gtkcolorpickershellprivate.h	\
-	gtkcolorplaneprivate.h	\
-	gtkcolorscaleprivate.h	\
-	gtkcolorchooserprivate.h	\
-	gtkcomboboxprivate.h	\
-	gtkcomposetable.h	\
-	gtkcontainerprivate.h   \
-	gtkcssanimationprivate.h	\
-	gtkcssanimatedstyleprivate.h	\
-	gtkcssarrayvalueprivate.h	\
-	gtkcssbgsizevalueprivate.h	\
-	gtkcssbordervalueprivate.h	\
-	gtkcsscalcvalueprivate.h	\
-	gtkcsscolorvalueprivate.h	\
-	gtkcsscornervalueprivate.h	\
-	gtkcsscustomgadgetprivate.h	\
-	gtkcsscustompropertyprivate.h 	\
-	gtkcssdimensionvalueprivate.h	\
-	gtkcsseasevalueprivate.h	\
-	gtkcssenginevalueprivate.h	\
-	gtkcssenumvalueprivate.h	\
-	gtkcssgadgetprivate.h		\
-	gtkcssiconthemevalueprivate.h	\
-	gtkcssimagebuiltinprivate.h	\
-	gtkcssimagecrossfadeprivate.h	\
-	gtkcssimagefallbackprivate.h	\
-	gtkcssimagegradientprivate.h	\
-	gtkcssimageiconthemeprivate.h	\
-	gtkcssimagelinearprivate.h	\
-	gtkcssimageradialprivate.h	\
-	gtkcssimageprivate.h	\
-	gtkcssimagesurfaceprivate.h	\
-	gtkcssimageurlprivate.h	\
-	gtkcssimagerecolorprivate.h	\
-	gtkcssimagescaledprivate.h	\
-	gtkcssimagevalueprivate.h	\
-	gtkcssimagewin32private.h	\
-	gtkcssinheritvalueprivate.h	\
-	gtkcssinitialvalueprivate.h	\
-	gtkcsskeyframesprivate.h	\
-	gtkcsslookupprivate.h	\
-	gtkcssmatcherprivate.h	\
-	gtkcssnodeprivate.h		\
-	gtkcssnodedeclarationprivate.h	\
-	gtkcssnodestylecacheprivate.h	\
-	gtkcssnumbervalueprivate.h	\
-	gtkcsspalettevalueprivate.h	\
-	gtkcssparserprivate.h	\
-	gtkcsspathnodeprivate.h	\
-	gtkcsspositionvalueprivate.h	\
-	gtkcssproviderprivate.h	\
-	gtkcssrepeatvalueprivate.h	\
-	gtkcssrgbavalueprivate.h	\
-	gtkcsssectionprivate.h 	\
-	gtkcssselectorprivate.h	\
-	gtkcssshadowsvalueprivate.h	\
-	gtkcssshadowvalueprivate.h      \
-	gtkcssshorthandpropertyprivate.h \
-	gtkcssstaticstyleprivate.h	\
-	gtkcssstringvalueprivate.h	\
-	gtkcssstylefuncsprivate.h \
-	gtkcssstylechangeprivate.h 	\
-	gtkcssstyleprivate.h 	\
-	gtkcssstylepropertyprivate.h \
-	gtkcsstransformvalueprivate.h	\
-	gtkcsstransientnodeprivate.h	\
-	gtkcsstransitionprivate.h	\
-	gtkcsstypedvalueprivate.h	\
-	gtkcssunsetvalueprivate.h	\
-	gtkcssvalueprivate.h	\
-	gtkcsswin32sizevalueprivate.h   \
-	gtkcsswidgetnodeprivate.h	\
-	gtkcustompaperunixdialog.h \
-	gtkdialogprivate.h 	\
-	gtkdndprivate.h		\
-	gtkemojichooser.h	\
-	gtkemojicompletion.h	\
-	gtkentryprivate.h	\
-	gtkeventcontrollerprivate.h	\
-	gtkfilechooserembed.h	\
-	gtkfilechooserentry.h	\
-	gtkfilechooserprivate.h	\
-	gtkfilechoosernativeprivate.h	\
-	gtkfilechooserwidgetprivate.h	\
-	gtkfilechooserutils.h	\
-	gtkfilefilterprivate.h	\
-	gtkfilesystem.h		\
-	gtkfilesystemmodel.h	\
-	gtkfontchooserprivate.h	\
-	gtkfontchooserutils.h	\
-	gtkfontchooserwidgetprivate.h \
-	gtkgestureprivate.h	\
-	gtkgesturedragprivate.h	\
-	gtkgesturelongpressprivate.h	\
-	gtkgesturemultipressprivate.h	\
-	gtkgesturepanprivate.h	\
-	gtkgesturerotateprivate.h	\
-	gtkgesturesingleprivate.h	\
-	gtkgesturestylusprivate.h	\
-	gtkgestureswipeprivate.h	\
-	gtkgesturezoomprivate.h	\
-	gtkheaderbarprivate.h	\
-	gtkhslaprivate.h	\
-	gtkiconcache.h		\
-	gtkiconhelperprivate.h  \
-	gtkiconprivate.h	\
-	gtkiconthemeprivate.h  \
-	gtkiconviewprivate.h	\
-	gtkimagedefinitionprivate.h	\
-	gtkimageprivate.h	\
-	gtkimmoduleprivate.h	\
-	gtkimcontextsimpleseqs.h \
-	gtkintl.h		\
-	gtkkeyhash.h		\
-	gtkkineticscrolling.h	\
-	gtklabelprivate.h	\
-	gtklockbuttonprivate.h	\
-	gtkmagnifierprivate.h	\
-	gtkmenubuttonprivate.h	\
-	gtkmenuprivate.h	\
-	gtkmenuitemprivate.h	\
-	gtkmenusectionbox.h	\
-	gtkmenushellprivate.h	\
-	gtkmenutracker.h	\
-	gtkmenutrackeritem.h	\
-	gtkmnemonichash.h	\
-	gtkmodelmenuitem.h	\
-	gtkmodifierstyle.h	\
-	gtkmodulesprivate.h	\
-	gtkmountoperationprivate.h \
-	gtknativedialogprivate.h \
-	gtkorientableprivate.h	\
-	gtkpango.h		\
-	gtkpathbar.h		\
-	gtkplacessidebarprivate.h	\
-	gtkplacesviewprivate.h	\
-	gtkplacesviewrowprivate.h	\
-	gtkpopoverprivate.h	\
-	gtkprintoperation-private.h \
-	gtkprintutils.h		\
-	gtkprivate.h		\
-	gtkpixelcacheprivate.h	\
-	gtkprogresstrackerprivate.h	\
-	gtkquery.h		\
-	gtkrangeprivate.h	\
-	gtkrbtree.h		\
-	gtkrecentchooserdefault.h \
-	gtkrecentchooserprivate.h \
-	gtkrecentchooserutils.h	\
-	gtkrenderbackgroundprivate.h \
-	gtkrenderborderprivate.h \
-	gtkrendericonprivate.h	\
-	gtkrenderprivate.h	\
-	gtkresources.h		\
-	gtkroundedboxprivate.h	\
-	gtksearchengine.h	\
-	gtksearchenginesimple.h	\
-	gtksearchenginemodel.h	\
-	gtksearchentryprivate.h \
-	gtkselectionprivate.h	\
-	gtksettingsprivate.h	\
-	gtkshortcutswindowprivate.h	\
-	gtkshortcutsshortcutprivate.h	\
-	gtksidebarrowprivate.h	\
-	gtksizegroup-private.h	\
-	gtksizerequestcacheprivate.h	\
-	gtksocketprivate.h	\
-	gtkstyleanimationprivate.h \
-	gtkstylecascadeprivate.h \
-	gtkstylecontextprivate.h \
-	gtkstylepropertyprivate.h \
-	gtkstyleproviderprivate.h \
-	gtktextattributesprivate.h \
-	gtktextbtree.h		\
-	gtktextbufferprivate.h \
-	gtktextbufferserialize.h \
-	gtktextchildprivate.h	\
-	gtktexthandleprivate.h	\
-	gtktextiterprivate.h	\
-	gtktextmarkprivate.h	\
-	gtktextsegment.h	\
-	gtktexttagprivate.h	\
-	gtktexttagtableprivate.h	\
-	gtktexttypes.h		\
-	gtktextutil.h		\
-	gtktrashmonitor.h	\
-	gtktogglebuttonprivate.h \
-	gtktoolbarprivate.h	\
-	gtktoolpaletteprivate.h	\
-	gtktooltipprivate.h	\
-	gtktooltipwindowprivate.h \
-	gtktreedatalist.h	\
-	gtktreeprivate.h	\
-	gtkutilsprivate.h	\
-	gtkwidgetprivate.h	\
-	gtkwidgetpathprivate.h	\
-	gtkwin32drawprivate.h	\
-	gtkwin32themeprivate.h	\
-	gtkwindowprivate.h	\
-	gtktreemenu.h		\
-	gdkpixbufutilsprivate.h \
-	open-type-layout.h	\
-	language-names.h	\
-	script-names.h
-
-# GTK base sources (had to split those in 2 parts to avoid U1095 error :|, order unchanged from before)
-# gtk_base_c_sources_base_gtka_gtkh: sources from gtka* to gtkh*, mostly
-# gtk_base_c_sources_base_gtki_gtkw: sources from gtki* to gtkw*, mostly
-gtk_base_c_sources_base_gtka_gtkh =	\
-	gtkactionmuxer.c	\
-	gtkactionobserver.c	\
-	gtkactionobservable.c	\
-	gtkactionable.c		\
-	gtkquery.c		\
-	gtksearchbar.c		\
-	gtksearchentry.c	\
-	gtksearchengine.c	\
-	gtksearchenginesimple.c	\
-	gtksearchenginemodel.c	\
-	fnmatch.c		\
-	gtkaboutdialog.c	\
-	gtkaccelgroup.c		\
-	gtkaccellabel.c		\
-	gtkaccelmap.c		\
-	gtkaccessible.c		\
-	gtkactionbar.c		\
-	gtkactionhelper.c	\
-	gtkadjustment.c		\
-	gtkallocatedbitmask.c	\
-	gtkappchooser.c		\
-	gtkappchooserwidget.c	\
-	gtkappchooserbutton.c	\
-	gtkappchooserdialog.c	\
-	gtkapplication.c	\
-	gtkapplicationaccels.c	\
-	gtkapplicationimpl.c	\
-	gtkapplicationwindow.c	\
-	gtkaspectframe.c	\
-	gtkassistant.c		\
-	gtkbbox.c		\
-	gtkbin.c		\
-	gtkbindings.c		\
-	gtkbookmarksmanager.c	\
-	gtkborder.c		\
-	gtkbox.c		\
-	gtkboxgadget.c		\
-	gtkbuildable.c		\
-	gtkbuilder.c		\
-	gtkbuilderparser.c	\
-	gtkbuilder-menus.c	\
-	gtkbuiltinicon.c	\
-	gtkbutton.c		\
-	gtkcairoblur.c		\
-	gtkcalendar.c		\
-	gtkcellarea.c		\
-	gtkcellareabox.c	\
-	gtkcellareaboxcontext.c	\
-	gtkcellareacontext.c	\
-	gtkcelleditable.c	\
-	gtkcelllayout.c		\
-	gtkcellrenderer.c	\
-	gtkcellrendereraccel.c	\
-	gtkcellrenderercombo.c	\
-	gtkcellrendererpixbuf.c	\
-	gtkcellrendererprogress.c \
-	gtkcellrendererspin.c	\
-	gtkcellrendererspinner.c \
-	gtkcellrenderertext.c	\
-	gtkcellrenderertoggle.c	\
-	gtkcellview.c		\
-	gtkcheckbutton.c	\
-	gtkcheckmenuitem.c	\
-	gtkcolorbutton.c	\
-	gtkcolorchooser.c	\
-	gtkcolorchooserwidget.c	\
-	gtkcolorchooserdialog.c	\
-	gtkcoloreditor.c	\
-	gtkcolorpicker.c	\
-	gtkcolorpickerkwin.c	\
-	gtkcolorpickerportal.c	\
-	gtkcolorpickershell.c	\
-	gtkcolorplane.c		\
-	gtkcolorscale.c		\
-	gtkcolorswatch.c	\
-	gtkcolorutils.c		\
-	gtkcombobox.c		\
-	gtkcomboboxtext.c	\
-	gtkcomposetable.c	\
-	gtkcontainer.c		\
-	gtkcssanimation.c	\
-	gtkcssanimatedstyle.c	\
-	gtkcssarrayvalue.c	\
-	gtkcssbgsizevalue.c	\
-	gtkcssbordervalue.c	\
-	gtkcsscalcvalue.c	\
-	gtkcsscolorvalue.c	\
-	gtkcsscornervalue.c	\
-	gtkcsscustomgadget.c	\
-	gtkcsscustomproperty.c	\
-	gtkcssdimensionvalue.c	\
-	gtkcsseasevalue.c	\
-	gtkcssenumvalue.c	\
-	gtkcssenginevalue.c	\
-	gtkcssgadget.c		\
-	gtkcssiconthemevalue.c	\
-	gtkcssimage.c		\
-	gtkcssimagebuiltin.c	\
-	gtkcssimagecrossfade.c	\
-	gtkcssimagefallback.c	\
-	gtkcssimagegradient.c	\
-	gtkcssimageicontheme.c	\
-	gtkcssimagelinear.c	\
-	gtkcssimageradial.c	\
-	gtkcssimagesurface.c	\
-	gtkcssimageurl.c	\
-	gtkcssimagerecolor.c	\
-	gtkcssimagescaled.c	\
-	gtkcssimagevalue.c	\
-	gtkcssimagewin32.c	\
-	gtkcssinheritvalue.c	\
-	gtkcssinitialvalue.c	\
-	gtkcsskeyframes.c	\
-	gtkcsslookup.c		\
-	gtkcssmatcher.c		\
-	gtkcssnode.c		\
-	gtkcssnodedeclaration.c	\
-	gtkcssnodestylecache.c	\
-	gtkcssnumbervalue.c	\
-	gtkcsspalettevalue.c	\
-	gtkcssparser.c		\
-	gtkcsspathnode.c	\
-	gtkcsspositionvalue.c	\
-	gtkcssprovider.c	\
-	gtkcssrepeatvalue.c	\
-	gtkcssrgbavalue.c	\
-	gtkcsssection.c 	\
-	gtkcssselector.c	\
-	gtkcssstringvalue.c	\
-	gtkcssstyle.c		\
-	gtkcssstylechange.c 	\
-	gtkcssshadowsvalue.c	\
-	gtkcssshadowvalue.c	\
-	gtkcssshorthandproperty.c \
-	gtkcssshorthandpropertyimpl.c \
-	gtkcssstaticstyle.c	\
-	gtkcssstylefuncs.c	\
-	gtkcssstyleproperty.c	\
-	gtkcssstylepropertyimpl.c \
-	gtkcsstransformvalue.c	\
-	gtkcsstransientnode.c	\
-	gtkcsstransition.c	\
-	gtkcsstypedvalue.c	\
-	gtkcssunsetvalue.c	\
-	gtkcsstypes.c		\
-	gtkcssvalue.c		\
-	gtkcsswidgetnode.c	\
-	gtkcsswin32sizevalue.c  \
-	gtkdialog.c		\
-	gtkdragsource.c		\
-	gtkdrawingarea.c	\
-	gtkeditable.c		\
-	gtkemojichooser.c	\
-	gtkemojicompletion.c	\
-	gtkentry.c		\
-	gtkentrybuffer.c	\
-	gtkentrycompletion.c	\
-	gtkeventbox.c		\
-	gtkeventcontroller.c	\
-	gtkeventcontrollerkey.c	\
-	gtkeventcontrollermotion.c	\
-	gtkeventcontrollerscroll.c	\
-	gtkexpander.c		\
-	gtkfilechooser.c	\
-	gtkfilechooserbutton.c	\
-	gtkfilechooserdialog.c	\
-	gtkfilechooserembed.c	\
-	gtkfilechooserentry.c	\
-	gtkfilechoosernative.c	\
-	gtkfilechoosernativeportal.c	\
-	gtkfilechooserutils.c	\
-	gtkfilechooserwidget.c	\
-	gtkfilefilter.c		\
-	gtkfilesystem.c		\
-	gtkfilesystemmodel.c	\
-	gtkfixed.c		\
-	gtkflowbox.c		\
-	gtkfontbutton.c		\
-	gtkfontchooser.c	\
-	gtkfontchooserdialog.c	\
-	gtkfontchooserutils.c	\
-	gtkfontchooserwidget.c	\
-	gtkframe.c		\
-	gtkgladecatalog.c	\
-	gtkgesture.c		\
-	gtkgesturedrag.c	\
-	gtkgesturelongpress.c	\
-	gtkgesturemultipress.c	\
-	gtkgesturepan.c		\
-	gtkgesturerotate.c	\
-	gtkgesturesingle.c	\
-	gtkgesturestylus.c	\
-	gtkgestureswipe.c	\
-	gtkgesturezoom.c	\
-	gtkglarea.c		\
-	gtkgrid.c		\
-	gtkheaderbar.c		\
-	gtkhsla.c
-
-gtk_base_c_sources_base_gtki_gtkw =	\
-	gtkicon.c		\
-	gtkiconcache.c		\
-	gtkiconcachevalidator.c	\
-	gtkiconhelper.c		\
-	gtkicontheme.c		\
-	gtkiconview.c		\
-	gtkimage.c		\
-	gtkimagedefinition.c	\
-	gtkimcontext.c		\
-	gtkimcontextsimple.c	\
-	gtkimmodule.c		\
-	gtkimmulticontext.c	\
-	gtkinfobar.c		\
-	gtkinvisible.c	\
-	gtkkeyhash.c		\
-	gtkkineticscrolling.c	\
-	gtklabel.c		\
-	gtklayout.c		\
-	gtklevelbar.c		\
-	gtklinkbutton.c		\
-	gtklistbox.c		\
-	gtkliststore.c		\
-	gtklockbutton.c		\
-	gtkmain.c		\
-	gtkmagnifier.c		\
-	gtkmenu.c		\
-	gtkmenubar.c		\
-	gtkmenubutton.c		\
-	gtkmenuitem.c		\
-	gtkmenusectionbox.c	\
-	gtkmenushell.c		\
-	gtkmenutracker.c	\
-	gtkmenutrackeritem.c	\
-	gtkmenutoolbutton.c	\
-	gtkmessagedialog.c	\
-	gtkmnemonichash.c	\
-	gtkmodelmenuitem.c	\
-	gtkmodelbutton.c	\
-	gtkmodifierstyle.c	\
-	gtkmodules.c		\
-	gtkmountoperation.c	\
-	gtknativedialog.c	\
-	gtknotebook.c		\
-	gtkoffscreenwindow.c	\
-	gtkorientable.c		\
-	gtkoverlay.c		\
-	gtkpadcontroller.c	\
-	gtkpagesetup.c		\
-	gtkpaned.c		\
-	gtkpango.c		\
-	gtkpapersize.c		\
-	gtkpathbar.c		\
-	gtkplacessidebar.c	\
-	gtkplacesview.c		\
-	gtkplacesviewrow.c	\
-	gtkprintcontext.c	\
-	gtkprintoperation.c	\
-	gtkprintoperationpreview.c \
-	gtkprintsettings.c	\
-	gtkprintutils.c		\
-	gtkprivate.c		\
-	gtkprogressbar.c	\
-	gtkprogresstracker.c	\
-	gtkpixelcache.c		\
-	gtkpopover.c		\
-	gtkpopovermenu.c	\
-	gtkradiobutton.c	\
-	gtkradiomenuitem.c	\
-	gtkradiotoolbutton.c	\
-	gtkrange.c		\
-	gtkrbtree.c		\
-	gtkrecentchooserdefault.c \
-	gtkrecentchooserdialog.c \
-	gtkrecentchoosermenu.c	\
-	gtkrecentchooserwidget.c \
-	gtkrecentchooserutils.c	\
-	gtkrecentchooser.c	\
-	gtkrecentfilter.c	\
-	gtkrecentmanager.c	\
-	gtkrender.c		\
-	gtkrenderbackground.c	\
-	gtkrenderborder.c	\
-	gtkrendericon.c		\
-	gtkrevealer.c		\
-	gtkroundedbox.c		\
-	gtkscale.c		\
-	gtkscalebutton.c	\
-	gtkscrollable.c		\
-	gtkscrollbar.c		\
-	gtkscrolledwindow.c	\
-	gtkselection.c		\
-	gtkseparator.c		\
-	gtkseparatormenuitem.c	\
-	gtkseparatortoolitem.c	\
-	gtksettings.c		\
-	gtkshortcutsgroup.c	\
-	gtkshortcutlabel.c	\
-	gtkshortcutsshortcut.c	\
-	gtkshortcutssection.c	\
-	gtkshortcutswindow.c	\
-	gtksidebarrow.c		\
-	gtksizegroup.c		\
-	gtksizerequest.c	\
-	gtksizerequestcache.c	\
-	gtkshow.c		\
-	gtkstacksidebar.c	\
-	gtkspinbutton.c		\
-	gtkspinner.c		\
-	gtkstack.c		\
-	gtkstackswitcher.c	\
-	gtkstatusbar.c		\
-	gtkstyleanimation.c	\
-	gtkstylecascade.c	\
-	gtkstylecontext.c	\
-	gtkstyleproperty.c	\
-	gtkstyleprovider.c	\
-	gtkstyleproviderprivate.c	\
-	gtkswitch.c		\
-	gtktestutils.c		\
-	gtktextattributes.c	\
-	gtktextbtree.c		\
-	gtktextbuffer.c		\
-	gtktextbufferrichtext.c	\
-	gtktextbufferserialize.c \
-	gtktextchild.c		\
-	gtktextdisplay.c	\
-	gtktexthandle.c		\
-	gtktextiter.c		\
-	gtktextlayout.c		\
-	gtktextmark.c		\
-	gtktextsegment.c	\
-	gtktexttag.c		\
-	gtktexttagtable.c	\
-	gtktexttypes.c		\
-	gtktextutil.c		\
-	gtktextview.c		\
-	gtktogglebutton.c	\
-	gtktoggletoolbutton.c	\
-	gtktoolbar.c		\
-	gtktoolbutton.c		\
-	gtktoolitem.c		\
-	gtktoolitemgroup.c	\
-	gtktoolpalette.c	\
-	gtktoolshell.c		\
-	gtktooltip.c		\
-	gtktooltipwindow.c	\
-	gtktrashmonitor.c	\
-	gtktreedatalist.c	\
-	gtktreednd.c		\
-	gtktreemenu.c		\
-	gtktreemodel.c		\
-	gtktreemodelfilter.c	\
-	gtktreemodelsort.c	\
-	gtktreeselection.c	\
-	gtktreesortable.c	\
-	gtktreestore.c		\
-	gtktreeview.c		\
-	gtktreeviewcolumn.c	\
-	gtkutils.c		\
-	gtkvolumebutton.c	\
-	gtkviewport.c		\
-	gtkwidget.c		\
-	gtkwidgetpath.c		\
-	gtkwindow.c		\
-	gtkwindowgroup.c	\
-	gtkwin32draw.c		\
-	gtkwin32theme.c		\
-	gdkpixbufutils.c	\
-	language-names.c	\
-	script-names.c
-
-gtk_base_c_sources_base = $(gtk_base_c_sources_base_gtka_gtkh) $(gtk_base_c_sources_base_gtki_gtkw)
-
-# Clipboard/dnd platform-specific sources
-gtk_clipboard_dnd_c_sources_quartz =	\
-	gtkclipboard-quartz.c	\
-	gtkdnd-quartz.c
-
-gtk_clipboard_dnd_c_sources_generic =	\
-	gtkclipboard.c 		\
-	gtkdnd.c		\
-	gtkdragdest.c
-
-# Stub sources
-gtk_use_stub_c_sources = 	\
-	gtkmountoperation-stub.c
-	
-# Base platform-specific sources
-gtk_os_unix_c_sources_base =	\
-	gtkcustompaperunixdialog.c	\
-	gtkpagesetupunixdialog.c	\
-	gtkprinter.c			\
-	gtkprinteroption.c		\
-	gtkprinteroptionset.c		\
-	gtkprinteroptionwidget.c	\
-	gtkprintjob.c			\
-	gtkprintoperation-unix.c	\
-	gtkprintoperation-portal.h	\
-	gtkprintoperation-portal.c	\
-	gtkprintunixdialog.c		\
-	gtkprintbackend.c		\
-	gtksearchenginetracker.c
-
-gtk_os_unix_private_h_sources =	\
-	gtkiconcachevalidator.h		\
-	gtkprintbackend.h		\
-	gtkprinter-private.h		\
-	gtkprinteroption.h		\
-	gtkprinteroptionset.h		\
-	gtkprinteroptionwidget.h	\
-	gtksearchenginetracker.h
-
-gtk_os_unix_tracker3_private_h_sources = gtksearchenginetracker3.h
-gtk_os_unix_tracker3_c_sources = gtksearchenginetracker3.c
-
-gtk_use_wayland_c_sources = \
-	gtkapplication-wayland.c
-
-gtk_use_wayland_or_x11_c_sources = \
-	gtkapplication-dbus.c
-
-gtk_use_x11_c_sources = 	\
-	gtkplug.c		\
-	gtksocket.c		\
-	gtkxembed.c		\
-	deprecated/gtktrayicon-x11.c	\
-	gtkapplication-x11.c	\
-	gtkmountoperation-x11.c
-
-gtk_use_x11_private_h_sources = 	\
-	gtkxembed.h		\
-	deprecated/gtktrayicon.h	\
-	xembed.h
-
-gtk_os_win32_c_sources = \
-	gtkprint-win32.c		\
-	gtkprintoperation-win32.c	\
-	gtkfilechoosernativewin32.c	\
-	gtkwin32.c
-
-gtk_os_win32_private_h_sources = gtkprint-win32.h
-
-gtk_use_win32_private_h_sources = 	\
-	gtkwin32embed.h		\
-	gtkwin32embedwidget.h
-
-gtk_use_win32_c_sources = 	\
-	gtkwin32embed.c		\
-	gtkwin32embedwidget.c	\
-	$(gtk_use_stub_c_sources)
-
-gtk_use_quartz_c_sources = 	\
-	gtksearchenginequartz.c	\
-	$(gtk_use_stub_c_sources) \
-	gtkapplication-quartz.c \
-	gtkapplication-quartz-menu.c \
-	gtkfilechoosernativequartz.c \
-	gtkquartz.c
-
-gtk_use_quartz_private_h_sources = 	\
-	gtksearchenginequartz.h	\
-	gtkquartz.h
-
-# Generated sources
-# built sources that get installed with the header files
-gtk_built_public_sources =			\
-	gtktypebuiltins.h
-
-# built headers that don't get installed
-gtk_dbus_built_sources = gtkdbusgenerated.c gtkdbusgenerated.h
-
-gtk_built_private_headers =			\
-	gtkresources.h				\
-	gtkmarshalers.h				\
-	gtkprivatetypebuiltins.h
-
-gtk_other_built_sources =	\
-	gtkresources.c				\
-	gtk.gresource.xml			\
-	gtktypebuiltins.c			\
-	gtkmarshalers.c				\
-	gtkprivatetypebuiltins.c
-
-# non-header sources (headers should be specified in the above variables)
-# that don't serve as direct make target sources, i.e. they don't have
-# their own .lo rules and don't get publically installed
-gtk_extra_sources =				\
-	paper_names.c				\
-	paper_names_offsets.c			\
-	gen-paper-names.c			\
-	deprecated/gtkstatusicon-quartz.c	\
-	gtkversion.h.in				\
-	gtkmarshalers.list			\
-	fallback-c89.c
-
-# Resources
-# Base UI templates
-gtk_base_ui_templates =	\
-	ui/gtkapplication-quartz.ui	\
-	ui/gtkaboutdialog.ui		\
-	ui/gtkactionbar.ui		\
-	ui/gtkappchooserdialog.ui	\
-	ui/gtkappchooserwidget.ui	\
-	ui/gtkassistant.ui		\
-	ui/gtkcolorchooserdialog.ui	\
-	ui/gtkcoloreditor.ui		\
-	ui/gtkcombobox.ui		\
-	ui/gtkdialog.ui		\
-	ui/gtkfilechooserbutton.ui	\
-	ui/gtkemojichooser.ui		\
-	ui/gtkfilechooserwidget.ui	\
-	ui/gtkfilechooserdialog.ui	\
-	ui/gtkfontbutton.ui		\
-	ui/gtkfontchooserdialog.ui	\
-	ui/gtkfontchooserwidget.ui	\
-	ui/gtkinfobar.ui		\
-	ui/gtklockbutton.ui		\
-	ui/gtkmessagedialog.ui	\
-	ui/gtkpagesetupunixdialog.ui	\
-	ui/gtkpathbar.ui		\
-	ui/gtkplacesview.ui		\
-	ui/gtkplacesviewrow.ui		\
-	ui/gtkprintunixdialog.ui	\
-	ui/gtkrecentchooserdefault.ui	\
-	ui/gtksearchbar.ui		\
-	ui/gtkscalebutton.ui		\
-	ui/gtkstatusbar.ui		\
-	ui/gtktooltipwindow.ui		\
-	ui/gtkvolumebutton.ui		\
-	ui/gtksidebarrow.ui
-
-gesture_sources = 				\
-	gesture/gesture-pinch-symbolic.svg			\
-	gesture/gesture-stretch-symbolic.svg			\
-	gesture/gesture-rotate-clockwise-symbolic.svg		\
-	gesture/gesture-rotate-anticlockwise-symbolic.svg	\
-	gesture/gesture-two-finger-swipe-left-symbolic.svg	\
-	gesture/gesture-two-finger-swipe-right-symbolic.svg
-
-adwaita_theme_css_sources =	\
-	theme/Adwaita/gtk-contained.css 	\
-	theme/Adwaita/gtk-contained-dark.css 	\
-	theme/Adwaita/gtk.css 			\
-	theme/Adwaita/gtk-dark.css
-
-adwaita_theme_scss_sources =	\
-	theme/Adwaita/_colors-public.scss 	\
-	theme/Adwaita/_colors.scss 		\
-	theme/Adwaita/_common.scss 		\
-	theme/Adwaita/_drawing.scss 		\
-	theme/Adwaita/gtk-contained-dark.scss 	\
-	theme/Adwaita/gtk-contained.scss
-
-adwaita_theme_files =	\
-	theme/Adwaita/assets.txt 		\
-	theme/Adwaita/assets.svg 		\
-	theme/Adwaita/README 			\
-	$(adwaita_theme_css_sources)
-
-highcontrast_theme_css_sources =	\
-	theme/HighContrast/gtk-contained.css 	\
-	theme/HighContrast/gtk-contained-inverse.css \
-	theme/HighContrast/gtk.css 		\
-	theme/HighContrast/gtk-inverse.css
-
-highcontrast_theme_scss_sources =	\
-	theme/HighContrast/_colors-hc.scss 	\
-	theme/HighContrast/gtk-contained-inverse.scss \
-	theme/HighContrast/gtk-contained.scss
-
-win32_theme_css_sources =	\
-	theme/win32/gtk.css	 		\
-	theme/win32/gtk-win32-base.css
-	
-
diff --git a/gtk/gtkclipboard.c b/gtk/gtkclipboard.c
index b0caf16fdf..2484a580fb 100644
--- a/gtk/gtkclipboard.c
+++ b/gtk/gtkclipboard.c
@@ -2227,7 +2227,7 @@ _gtk_clipboard_store_all (void)
  *
  * Gets the selection that this clipboard is for.
  *
- * Returns: the selection
+ * Returns: (transfer none): the selection
  *
  * Since: 3.22
  */
diff --git a/gtk/gtkeventcontrollerscroll.h b/gtk/gtkeventcontrollerscroll.h
index 8b785a8a0f..3a39062c6e 100644
--- a/gtk/gtkeventcontrollerscroll.h
+++ b/gtk/gtkeventcontrollerscroll.h
@@ -69,11 +69,11 @@ GDK_AVAILABLE_IN_3_24
 GtkEventController *gtk_event_controller_scroll_new (GtkWidget                     *widget,
                                                      GtkEventControllerScrollFlags  flags);
 GDK_AVAILABLE_IN_3_24
-void                gtk_event_controller_scroll_set_flags (GtkEventControllerScroll      *controller,
+void                gtk_event_controller_scroll_set_flags (GtkEventControllerScroll      *scroll,
                                                            GtkEventControllerScrollFlags  flags);
 GDK_AVAILABLE_IN_3_24
 GtkEventControllerScrollFlags
-                    gtk_event_controller_scroll_get_flags (GtkEventControllerScroll      *controller);
+                    gtk_event_controller_scroll_get_flags (GtkEventControllerScroll      *scroll);
 
 G_END_DECLS
 
diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index 468ef2ae87..8ba764cf01 100644
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -4232,7 +4232,7 @@ gtk_label_style_updated (GtkWidget *widget)
   if (change == NULL || gtk_css_style_change_affects (change, GTK_CSS_AFFECTS_FONT))
     {
       gtk_label_clear_layout (GTK_LABEL (widget));
-      gtk_widget_queue_resize (label);
+      gtk_widget_queue_resize (widget);
     }
 
   if (change == NULL || gtk_css_style_change_affects (change, GTK_CSS_AFFECTS_TEXT_ATTRS) ||
diff --git a/gtk/gtkprivatetypebuiltins.c.template b/gtk/gtkprivatetypebuiltins.c.template
index d7961be8ef..031ffb8020 100644
--- a/gtk/gtkprivatetypebuiltins.c.template
+++ b/gtk/gtkprivatetypebuiltins.c.template
@@ -14,7 +14,7 @@
 GType
 _@enum_name@_get_type (void)
 {
-  static volatile gsize g_define_type_id__volatile = 0;
+  static gsize g_define_type_id__volatile = 0;
 
   if (g_once_init_enter (&g_define_type_id__volatile))
     {
diff --git a/gtk/gtktypebuiltins.c.template b/gtk/gtktypebuiltins.c.template
index 9a5a360f09..844e546b3d 100644
--- a/gtk/gtktypebuiltins.c.template
+++ b/gtk/gtktypebuiltins.c.template
@@ -13,7 +13,7 @@
 GType
 @enum_name@_get_type (void)
 {
-  static volatile gsize g_define_type_id__volatile = 0;
+  static gsize g_define_type_id__volatile = 0;
 
   if (g_once_init_enter (&g_define_type_id__volatile))
     {
diff --git a/gtk/inspector/Makefile.inc b/gtk/inspector/Makefile.inc
deleted file mode 100644
index 7641d3a9e5..0000000000
--- a/gtk/inspector/Makefile.inc
+++ /dev/null
@@ -1,79 +0,0 @@
-inspector_c_sources = 			\
-	inspector/action-editor.c	\
-	inspector/actions.c		\
-	inspector/cellrenderergraph.c	\
-	inspector/css-editor.c		\
-	inspector/css-node-tree.c	\
-	inspector/data-list.c		\
-	inspector/general.c		\
-	inspector/gestures.c		\
-	inspector/graphdata.c		\
-        inspector/gtkstackcombo.c       \
-	inspector/gtktreemodelcssnode.c	\
-	inspector/init.c		\
-	inspector/inspect-button.c	\
-	inspector/magnifier.c		\
-	inspector/menu.c		\
-	inspector/misc-info.c		\
-	inspector/object-hierarchy.c	\
-	inspector/object-tree.c		\
-	inspector/prop-editor.c		\
-	inspector/prop-list.c		\
-	inspector/resource-list.c	\
-	inspector/selector.c		\
-	inspector/signals-list.c	\
-	inspector/size-groups.c		\
-	inspector/statistics.c		\
-        inspector/strv-editor.c         \
-	inspector/treewalk.c		\
-	inspector/visual.c		\
-	inspector/window.c
-
-inspector_h_sources = 			\
-	inspector/action-editor.h	\
-	inspector/actions.h		\
-	inspector/cellrenderergraph.h	\
-	inspector/css-editor.h		\
-	inspector/css-node-tree.h	\
-	inspector/data-list.h		\
-	inspector/general.h		\
-	inspector/gestures.h		\
-	inspector/graphdata.h		\
-        inspector/gtkstackcombo.h       \
-	inspector/gtktreemodelcssnode.h	\
-	inspector/init.h		\
-	inspector/magnifier.h		\
-	inspector/menu.h		\
-	inspector/misc-info.h		\
-	inspector/object-hierarchy.h	\
-	inspector/object-tree.h		\
-	inspector/prop-editor.h		\
-	inspector/prop-list.h		\
-	inspector/resource-list.h	\
-	inspector/selector.h		\
-	inspector/signals-list.h	\
-	inspector/size-groups.h		\
-	inspector/statistics.h		\
-        inspector/strv-editor.h         \
-	inspector/treewalk.h		\
-	inspector/visual.h		\
-	inspector/window.h
-
-inspector_templates =			\
-	inspector/actions.ui 		\
-	inspector/css-editor.ui 	\
-	inspector/css-node-tree.ui	\
-	inspector/data-list.ui 		\
-	inspector/general.ui 		\
-	inspector/magnifier.ui		\
-	inspector/menu.ui		\
-	inspector/misc-info.ui		\
-	inspector/object-hierarchy.ui 	\
-	inspector/object-tree.ui 	\
-	inspector/prop-list.ui 		\
-	inspector/resource-list.ui	\
-	inspector/selector.ui		\
-	inspector/signals-list.ui	\
-	inspector/statistics.ui		\
-	inspector/visual.ui		\
-	inspector/window.ui
diff --git a/gtk/meson.build b/gtk/meson.build
index 79f4f0d234..21540dd93b 100644
--- a/gtk/meson.build
+++ b/gtk/meson.build
@@ -847,7 +847,7 @@ gtk_deps = [
 ]
 
 if x11_enabled
-  x11_data_prefix = dependency('x11').get_pkgconfig_variable('prefix')
+  x11_data_prefix = dependency('x11').get_variable(pkgconfig: 'prefix')
 
   gtk_cargs += [ '-DX11_DATA_PREFIX="@0@"'.format(x11_data_prefix), ]
   gtk_sources += gtk_use_x11_sources
@@ -1147,8 +1147,6 @@ gtk_launch = executable(
 )
 gtk_tools += gtk_launch
 
-if meson.version().version_compare('>=0.54.0')
-  foreach tool: gtk_tools
-    meson.override_find_program(tool.name(), tool)
-  endforeach
-endif
+foreach tool: gtk_tools
+  meson.override_find_program(tool.name(), tool)
+endforeach