autotools build: Don't generate NMake snippets for introspection

We now have those parts directly in our NMake Makefiles used for
introspection, which results from the work to split out the source file
listings from gdk/Makefile.am and gtk/Makefile.am, so we could drop
those items from our autotools build files where those snippets were
generated during 'make dist'.

build/Makefile.msvc-introspection

@@ -1,128 +0,0 @@
-# Author: Fan, Chun-wei
-# Common autotools file for constructing the g-ir-scanner and
-# g-ir-compiler command lines for Visual Studio builds.
-
-# This is copied from $(srcroot)/build from the gobject-introspection
-# project, which may be included in projects that support both
-# Visual Studio builds and introspection.
-
-# * Input variables:
-#
-#   MSVC_INTROSPECT_GIRS - List of .gir's that should be built
-#                          in the NMake Makefiles
-#
-# * Simple tutorial
-#
-# Add this to Makefile.am where your library/program is built:
-#   (Either YourLib_1_0_gir_MSVC_LIBS or YourLib_1_0_gir_MSVC_PROGRAM
-#    is required unless --headers-only is specified in
-#    YourLib_1_0_gir__MSVC_SCANNERFLAGS)
-#
-#   include $(top_srcdir)/build/Makefile.msvc-introspection
-#   MSVC_INTROSPECT_GIRS = YourLib-1.0.gir
-#   YourLib_1_0_gir_NAMESPACE = YourLib # This is optional
-#   YourLib_1_0_gir_VERSION = 1.0 # This is optional
-#   YourLib_1_0_gir_MSVC_LIBS = yourlib-1.0
-#   YourLib_1_0_gir_MSVC_FILES = $(libyourlib_1_0_SOURCES)
-#   YourLib_1_0_gir_MSVC_PROGRAM = YourProgram
-#   YourLib_1_0_gir_MSVC_PACKAGES = (Dependent .pc files)
-#   YourLib_1_0_gir_MSVC_INCLUDE_GIRS = (Dependent external .gir's)
-#   YourLiv_1_0_gir_MSVC_EXPORT_PACKAGES = (Packages exported by this .gir)
-
-# Private functions
-
-## Transform the MSVC project filename (no filename extensions) to something which can reference through a variable
-## without automake/make complaining, eg Gtk-2.0 -> Gtk_2_0
-_gir_name=$(subst /,_,$(subst -,_,$(subst .,_,$(1))))
-
-# Namespace and Version is either fetched from the gir filename
-# or the _NAMESPACE/_VERSION variable combo
-_gir_namespace_msvc = $(or $($(_gir_name)_NAMESPACE),$(firstword $(subst -, ,$(notdir $(1)))))
-_gir_version_msvc = $(or $($(_gir_name)_VERSION),$(lastword $(subst -, ,$(1:.gir=))))
-_typelib_basename_msvc = $(_gir_namespace_msvc)'-'$(_gir_version_msvc)
-
-# _PROGRAM is an optional variable which needs its own --program argument
-_gir_program_msvc = $(if $($(_gir_name)_MSVC_PROGRAM),--program=$($(_gir_name)_MSVC_PROGRAM))
-
-# Deduce the sub-folder from $(srcroot) where the sources reside in
-_gir_source_path_raw_msvc:=$(subst $(abs_top_srcdir),,$(abs_srcdir))
-_gir_source_path_msvc=$(subst /,\\,$(_gir_source_path_raw_msvc))
-_gir_source_subdir_int_msvc=$(subst \\\\,\\,\\$(_gir_source_path_msvc)\\)
-_gir_source_subdir_msvc=$(subst \\.\\,\\,$(_gir_source_subdir_int_msvc))
-
-_gir_files_raw_msvc=$(subst /,\\,$($(_gir_name)_MSVC_FILES))
-_gir_files_msvc=$(subst $(srcdir)\\,,$(subst $(builddir)\\,,$(subst $(top_builddir)\\$(_gir_source_path_msvc)\\,\\,$(_gir_files_raw_msvc))))
-
-# Create a list of items for:
-# - Libraries
-# - Packages
-# - GIRs to include
-# - packages to export
-
-_gir_libraries_msvc = $(foreach lib,$($(_gir_name)_MSVC_LIBS),--library=$(lib))
-_gir_packages_msvc = $(foreach pkg,$($(_gir_name)_MSVC_PACKAGES),--pkg=$(pkg))
-_gir_includes_msvc = $(foreach include,$($(_gir_name)_MSVC_INCLUDE_GIRS),--include=$(include))
-_gir_export_packages_msvc = $(foreach pkg,$($(_gir_name)_MSVC_EXPORT_PACKAGES),--pkg-export=$(pkg))
-
-#
-# Create NMake Makefile Sections for Building Introspection files
-# from autotools files
-# $(1) - File Name of the .gir that is to be generated
-#
-
-define gir-nmake-builder
-
-# Basic sanity check, to make sure required variables are set
-$(if $($(_gir_name)_MSVC_FILES),,$(error Need to define $(_gir_name)_MSVC_FILES))
-$(if $(or $(findstring --header-only,$($(_gir_name)_MSVC_SCANNERFLAGS)),
-          $($(_gir_name)_MSVC_LIBS),
-          $($(_gir_name)_MSVC_PROGRAM)),,
-    $(error Need to define $(_gir_name)_MSVC_LIBS or $(_gir_name)_MSVC_PROGRAM))
-
-$(top_builddir)/build/win32/$(_gir_name)_list: Makefile
-	rm -f $(top_builddir)/build/win32/$(_gir_name)_list
-	for F in $(_gir_files_msvc); do \
-		case $$$$F in \
-		*.c|*.cpp|*.cc|*.cxx|*.h|*.hpp|*.hh|*.hxx) \
-			echo '..\..'$(_gir_source_subdir_msvc)$$$$F >>$(top_builddir)/build/win32/$(_gir_name)_list \
-			;; \
-		esac; \
-	done
-
-$(top_builddir)/build/win32/$(1).msvc.introspect: Makefile
-	-$(RM) $(top_builddir)/build/win32/$(1).msvc.introspect
-
-# Assemble the Command to Run g-ir-scanner
-	echo 'vs$$$$(VSVER)\$$$$(CFG)\$$$$(PLAT)\bin\'$(1)': '$(_gir_name)'_list '$($(_gir_name)_MSVC_GIR_DEPS)>>$(top_builddir)/build/win32/$(1).msvc.introspect
-	echo '	@-echo Generating $$$$@...'>>$(top_builddir)/build/win32/$(1).msvc.introspect
-	echo '	$$$$(PYTHON) $$$$(G_IR_SCANNER)	\'>>$(top_builddir)/build/win32/$(1).msvc.introspect
-	echo '	--verbose -no-libtool	\'>>$(top_builddir)/build/win32/$(1).msvc.introspect
-	echo '	--namespace='$(_gir_namespace_msvc)'	\'>>$(top_builddir)/build/win32/$(1).msvc.introspect
-	echo '	--nsversion='$(_gir_version_msvc)'	\'>>$(top_builddir)/build/win32/$(1).msvc.introspect
-	echo '	'$(_gir_packages_msvc)'	\'>>$(top_builddir)/build/win32/$(1).msvc.introspect
-	echo '	'$(_gir_libraries_msvc)'	\'>>$(top_builddir)/build/win32/$(1).msvc.introspect
-	echo '	'$(_gir_program_msvc)'	\'>>$(top_builddir)/build/win32/$(1).msvc.introspect
-	echo '	--add-include-path=./vs$$$$(VSVER)/$$$$(CFG)/$$$$(PLAT)/bin	\'>>$(top_builddir)/build/win32/$(1).msvc.introspect
-	echo '	--add-include-path=$$$$(G_IR_INCLUDEDIR)	\'>>$(top_builddir)/build/win32/$(1).msvc.introspect
-	echo '	'$(_gir_includes_msvc)'	\'>>$(top_builddir)/build/win32/$(1).msvc.introspect
-	echo '	'$(_gir_export_packages_msvc)'	\'>>$(top_builddir)/build/win32/$(1).msvc.introspect
-	echo '	--cflags-begin	\'>>$(top_builddir)/build/win32/$(1).msvc.introspect
-	echo '	'$($(_gir_name)_MSVC_CFLAGS)'	\'>>$(top_builddir)/build/win32/$(1).msvc.introspect
-	echo '	--cflags-end	\'>>$(top_builddir)/build/win32/$(1).msvc.introspect
-	echo '	'$($(_gir_name)_MSVC_SCANNERFLAGS)'	\'>>$(top_builddir)/build/win32/$(1).msvc.introspect
-	echo '	--filelist='$(_gir_name)'_list	\'>>$(top_builddir)/build/win32/$(1).msvc.introspect
-	echo '	-L.\vs$$$$(VSVER)\$$$$(CFG)\$$$$(PLAT)\bin	\'>>$(top_builddir)/build/win32/$(1).msvc.introspect
-	echo '	-o $$$$@'>>$(top_builddir)/build/win32/$(1).msvc.introspect
-	echo '' >>$(top_builddir)/build/win32/$(1).msvc.introspect
-
-# Finally Assemble the Command to Compile the generated .gir
-	echo 'vs$$$$(VSVER)\$$$$(CFG)\$$$$(PLAT)\bin\$(_typelib_basename_msvc).typelib: vs$$$$(VSVER)\$$$$(CFG)\$$$$(PLAT)\bin\'$(_typelib_basename_msvc)'.gir'>>$(top_builddir)/build/win32/$(1).msvc.introspect
-	echo '	@-echo Compiling $$$$@...'>>$(top_builddir)/build/win32/$(1).msvc.introspect
-	echo '	$$$$(G_IR_COMPILER)	\'>>$(top_builddir)/build/win32/$(1).msvc.introspect
-	echo '	--includedir=$$$$(@D:\=/) --debug --verbose	\'>>$(top_builddir)/build/win32/$(1).msvc.introspect
-	echo '	$$$$(@R:\=/).gir	\'>>$(top_builddir)/build/win32/$(1).msvc.introspect
-	echo '	-o $$$$@'>>$(top_builddir)/build/win32/$(1).msvc.introspect
-	echo '' >>$(top_builddir)/build/win32/$(1).msvc.introspect
-endef
-
-$(foreach gir,$(MSVC_INTROSPECT_GIRS),$(eval $(call gir-nmake-builder,$(gir))))

build/win32/Makefile.am

@@ -1,31 +1,5 @@
 include $(top_srcdir)/Makefile.decl
 
-if HAVE_INTROSPECTION
-GENERATED_ITEMS = \
-	introspection.body.mak	\
-	Gdk_3_0_gir_list		\
-	GdkWin32_3_0_gir_list	\
-	Gtk_3_0_gir_list
-
-MSVC_INTROSPECTION_INTERMEDIATE_FILES = Gdk-3.0.gir.msvc.introspect GdkWin32-3.0.gir.msvc.introspect Gtk-3.0.gir.msvc.introspect
-
-introspection.body.mak: $(MSVC_INTROSPECTION_INTERMEDIATE_FILES)
-	-$(RM) introspection.body.mak
-	for F in `ls *.msvc.introspect`; do \
-		case $$F in \
-			*)	cat $(top_builddir)/build/win32/$$F >>introspection.body.mak \
-			;; \
-		esac; \
-	done
-	$(RM) $(MSVC_INTROSPECTION_INTERMEDIATE_FILES)
-
-DISTCLEANFILES = $(GENERATED_ITEMS)
-
-else
-GENERATED_ITEMS =
-DISTCLEANFILES =
-endif
-
 SUBDIRS =	\
 	vs9 	\
 	vs10	\
@@ -48,7 +22,6 @@ EXTRA_DIST +=	\
 	replace.py			\
 	pc_base.py			\
 	gtkpc.py			\
-	README_EGL_MSVC.txt		\
-	$(GENERATED_ITEMS)
+	README_EGL_MSVC.txt
 
 -include $(top_srcdir)/git.mk

build/win32/create-lists-msvc.mak

@@ -98,4 +98,38 @@ NULL=
 !include resources_sources.mak
 
 !if [del /f /q resources_sources.mak]
+!endif
+
+# Get absolute path of glib-mkenums
+!if [call create-lists.bat header gtk_sources.mak GLIB_MKENUMS_ABS]
+!endif
+
+!if [for %f in ($(GLIB_MKENUMS)) do @call create-lists.bat file gtk_sources.mak %~ff]
+!endif
+
+!if [call create-lists.bat footer gtk_sources.mak]
+!endif
+
+# Get actual paths of demo sources in gtk-demo
+!if [call create-lists.bat header gtk_sources.mak GTK_DEMO_BASE_SRCS]
+!endif
+
+!if [for %f in ($(demos_base:		=)) do @call create-lists.bat file gtk_sources.mak ..\..\demos\gtk-demo\%f]
+!endif
+
+!if [call create-lists.bat footer gtk_sources.mak]
+!endif
+
+!if [call create-lists.bat header gtk_sources.mak GTK_FONT_FEATURE_DEMO_SRCS]
+!endif
+
+!if [for %f in ($(font_features_demo:		=)) do @call create-lists.bat file gtk_sources.mak ..\..\demos\gtk-demo\%f]
+!endif
+
+!if [call create-lists.bat footer gtk_sources.mak]
+!endif
+
+!include gtk_sources.mak
+
+!if [del /f /q gtk_sources.mak]
 !endif

build/win32/generate-msvc.mak

@@ -3,9 +3,12 @@
 # Items in here should not need to be edited unless
 # one is maintaining the NMake build files.
 
+!include ..\..\demos\gtk-demo\Makefile.inc
+
 !include config-msvc.mak
 !include create-lists-msvc.mak
 
+
 # Copy the pre-defined gdkconfig.h.[win32|win32_broadway]
 !if "$(CFG)" == "release" || "$(CFG)" == "Release"
 GDK_OLD_CFG = debug
@@ -23,6 +26,12 @@ GDK_DEL_CONFIG = broadway
 GDK_CONFIG_TEMPLATE = ..\..\gdk\gdkconfig.h.win32
 !endif
 
+gtk_demo_sources = $(GTK_DEMO_BASE_SRCS)
+
+!ifdef HARFBUZZ
+gtk_demo_sources = $(gtk_demo_sources) $(GTK_FONT_FEATURE_DEMO_SRCS)
+!endif
+
 GDK_MARSHALERS_FLAGS = --prefix=_gdk_marshal --valist-marshallers
 GDK_RESOURCES_ARGS = ..\..\gdk\gdk.gresource.xml --target=$@ --sourcedir=..\..\gdk --c-name _gdk --manual-register
 GTK_MARSHALERS_FLAGS = --prefix=_gtk_marshal --valist-marshallers
@@ -36,6 +45,8 @@ all:	\
 	..\..\gdk\gdkmarshalers.c	\
 	..\..\gdk\gdkresources.h	\
 	..\..\gdk\gdkresources.c	\
+	..\..\gdk\gdkenumtypes.h	\
+	..\..\gdk\gdkenumtypes.c	\
 	..\..\gtk\gtk-win32.rc	\
 	..\..\gtk\libgtk3.manifest	\
 	..\..\gtk\gtkdbusgenerated.h	\
@@ -44,6 +55,10 @@ all:	\
 	..\..\gtk\gtk.gresource.xml	\
 	..\..\gtk\gtkmarshalers.h	\
 	..\..\gtk\gtkmarshalers.c	\
+	..\..\gtk\gtktypebuiltins.h	\
+	..\..\gtk\gtktypebuiltins.c	\
+	..\..\gtk\gtkprivatetypebuiltins.h	\
+	..\..\gtk\gtkprivatetypebuiltins.c	\
 	..\..\gtk\gtkresources.h	\
 	..\..\gtk\gtkresources.c	\
 	..\..\demos\gtk-demo\demos.h	\
@@ -107,6 +122,29 @@ all:	\
 	@if not "$(GDK_PIXBUF_PIXDATA)" == "" set GDK_PIXBUF_PIXDATA=$(GDK_PIXBUF_PIXDATA)
 	@$(GLIB_COMPILE_RESOURCES) $(GDK_RESOURCES_ARGS) --generate-source
 
+# Create temporary Makefile for glib-mkenums in ..\..\gdk
+..\..\gdk\mkenums-msvc.mak:
+	@echo !include Makefile.inc>$@
+	@echo gdkenumtypes.h: Makefile.inc gdkenumtypes.h.template ^$(gdk_public_h_sources) ^$(gdk_deprecated_h_sources)>>$@
+	@echo.	@echo Generating ^$@...>>$@
+	@echo.	@^$(PYTHON) ^$(GLIB_MKENUMS_ABS) --template=^$@.template ^$(gdk_public_h_sources) ^$(gdk_deprecated_h_sources) --output ^$@.tmp>> $@
+	@echo.	@move ^$@.tmp ^$@>> $@
+	@echo.>>$@
+	@echo gdkenumtypes.c: Makefile.inc gdkenumtypes.c.template ^$(gdk_public_h_sources) ^$(gdk_deprecated_h_sources)>>$@
+	@echo.	@echo Generating ^$@...>>$@
+	@echo.	@^$(PYTHON) ^$(GLIB_MKENUMS_ABS) --template=^$@.template ^$(gdk_public_h_sources) ^$(gdk_deprecated_h_sources) --output ^$@.tmp>> $@
+	@echo.	@move ^$@.tmp ^$@>> $@
+
+..\..\gdk\gdkenumtypes.h: ..\..\gdk\gdkenumtypes.h.template $(gdk_pub_headers)
+..\..\gdk\gdkenumtypes.c: ..\..\gdk\gdkenumtypes.c.template $(gdk_pub_headers)
+
+..\..\gdk\gdkenumtypes.h ..\..\gdk\gdkenumtypes.c:
+	@$(MAKE) /nologo /f generate-msvc.mak ..\..\gdk\mkenums-msvc.mak
+	@cd ..\..\gdk
+	@$(MAKE) /nologo /f mkenums-msvc.mak PYTHON=$(PYTHON) GLIB_MKENUMS_ABS=$(GLIB_MKENUMS_ABS) $(@F)
+	@del mkenums-msvc.mak
+	@cd $(MAKEDIR)
+
 ..\..\gtk\libgtk3.manifest: ..\..\gtk\libgtk3.manifest.in
 	@echo Generating $@...
 	@$(PYTHON) replace.py	\
@@ -185,6 +223,45 @@ all:	\
 	@$(PYTHON) $(GLIB_GENMARSHAL) $(GTK_MARSHALERS_FLAGS) --body $** >> $@.tmp
 	@move $@.tmp $@
 
+..\..\gtk\mkenums-msvc.mak:
+	@echo !include a11y\Makefile.inc>$@
+	@echo !include deprecated\Makefile.inc>>$@
+	@echo !include inspector\Makefile.inc>>$@
+	@echo !include Makefile.inc>>$@
+	@echo gtktypebuiltins.h: a11y\Makefile.inc deprecated\Makefile.inc inspector\Makefile.inc Makefile.inc gtktypebuiltins.h.template ^$(gtk_public_h_sources) ^$(a11y_h_sources) ^$(gtk_deprecated_h_sources)>>$@
+	@echo.	@echo Generating ^$@...>>$@
+	@echo.	@^$(PYTHON) ^$(GLIB_MKENUMS_ABS) --template=^$@.template ^$(gtk_public_h_sources) ^$(a11y_h_sources) ^$(gtk_deprecated_h_sources) --output ^$@.tmp>> $@
+	@echo.	@move ^$@.tmp ^$@>> $@
+	@echo.>>$@
+	@echo gtktypebuiltins.c: a11y\Makefile.inc deprecated\Makefile.inc inspector\Makefile.inc Makefile.inc gtktypebuiltins.h.template ^$(gtk_public_h_sources) ^$(a11y_h_sources) ^$(gtk_deprecated_h_sources)>>$@
+	@echo.	@echo Generating ^$@...>>$@
+	@echo.	@^$(PYTHON) ^$(GLIB_MKENUMS_ABS) --template=^$@.template ^$(gtk_public_h_sources) ^$(a11y_h_sources) ^$(gtk_deprecated_h_sources) --output ^$@.tmp>> $@
+	@echo.	@move ^$@.tmp ^$@>> $@
+	@echo.>>$@
+	@echo gtkprivatetypebuiltins.h: a11y\Makefile.inc deprecated\Makefile.inc inspector\Makefile.inc Makefile.inc ^$(gtk_private_type_h_sources) gtkprivatetypebuiltins.h.template>>$@
+	@echo.	@echo Generating ^$@...>>$@
+	@echo.	@^$(PYTHON) ^$(GLIB_MKENUMS_ABS) --template=^$@.template ^$(gtk_private_type_h_sources) --output ^$@.tmp>> $@
+	@echo.	@move ^$@.tmp ^$@>> $@
+	@echo.>>$@
+	@echo gtkprivatetypebuiltins.c: a11y\Makefile.inc deprecated\Makefile.inc inspector\Makefile.inc Makefile.inc ^$(gtk_private_type_h_sources) gtkprivatetypebuiltins.c.template>>$@
+	@echo.	@echo Generating ^$@...>>$@
+	@echo.	@^$(PYTHON) ^$(GLIB_MKENUMS_ABS) --template=^$@.template ^$(gtk_private_type_h_sources) --output ^$@.tmp>> $@
+	@echo.	@move ^$@.tmp ^$@>> $@
+	@echo.>>$@
+
+..\..\gtk\gtktypebuiltins.h: ..\..\gtk\gtktypebuiltins.h.template
+..\..\gtk\gtktypebuiltins.c: ..\..\gtk\gtktypebuiltins.c.template
+..\..\gtk\gtkprivatetypebuiltins.h: ..\..\gtk\gtkprivatetypebuiltins.h.template
+..\..\gtk\gtkprivatetypebuiltins.c: ..\..\gtk\gtkprivatetypebuiltins.c.template
+
+..\..\gtk\gtktypebuiltins.h ..\..\gtk\gtktypebuiltins.c	\
+..\..\gtk\gtkprivatetypebuiltins.h ..\..\gtk\gtkprivatetypebuiltins.c:
+	@$(MAKE) /nologo /f generate-msvc.mak ..\..\gtk\mkenums-msvc.mak
+	@cd ..\..\gtk
+	@$(MAKE) /nologo /f mkenums-msvc.mak PYTHON=$(PYTHON) GLIB_MKENUMS_ABS=$(GLIB_MKENUMS_ABS) $(@F)
+	@del mkenums-msvc.mak
+	@cd $(MAKEDIR)
+
 ..\..\demos\gtk-demo\demo_resources.c: ..\..\demos\gtk-demo\demo.gresource.xml $(GTK_DEMO_RESOURCES)
 	@echo Generating $@...
 	@$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(@D) --generate-source $(@D)\demo.gresource.xml
@@ -193,11 +270,21 @@ all:	\
 	@echo Generating $@...
 	@$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(@D) --generate-source $(@D)\iconbrowser.gresource.xml
 
+..\..\demos\gtk-demo\demos.h.win32: ..\..\demos\gtk-demo\geninclude.pl.in $(gtk_demo_sources)
+	@echo Re-generating $@...
+	@cd $(@D)
+	@$(PERL) geninclude.pl.in $(gtk_demo_sources:..\..\demos\gtk-demo\=)> $@
+	@cd $(MAKEDIR)
+
 # Remove the generated files
 clean:
 	@-del /f /q ..\..\demos\icon-browser\resources.c
 	@-del /f /q ..\..\demos\gtk-demo\demo_resources.c
 	@-del /f /q ..\..\demos\gtk-demo\demos.h
+	@-del /f /q ..\..\gtk\gtkprivatetypebuiltins.c
+	@-del /f /q ..\..\gtk\gtkprivatetypebuiltins.h
+	@-del /f /q ..\..\gtk\gtktypebuiltins.c
+	@-del /f /q ..\..\gtk\gtktypebuiltins.h
 	@-del /f /q ..\..\gtk\gtkresources.c
 	@-del /f /q ..\..\gtk\gtkresources.h
 	@-del /f /q ..\..\gtk\gtkmarshalers.c
@@ -208,6 +295,8 @@ clean:
 	@-del /f /q ..\..\gtk\gtkdbusgenerated.h
 	@-del /f /q ..\..\gtk\libgtk3.manifest
 	@-del /f /q ..\..\gtk\gtk-win32.rc
+	@-del /f /q ..\..\gdk\gdkenumtypes.c
+	@-del /f /q ..\..\gdk\gdkenumtypes.h
 	@-del /f /q ..\..\gdk\gdkresources.c
 	@-del /f /q ..\..\gdk\gdkresources.h
 	@-del /f /q ..\..\gdk\gdk.gresource.xml

build/win32/gtk-introspection-msvc.mak

@@ -1,6 +1,13 @@
 # NMake Makefile to build Introspection Files for GTK+
 
 !include detectenv-msvc.mak
+!include config-msvc.mak
+
+!include ..\..\gdk\Makefile.inc
+!include ..\..\gtk\a11y\Makefile.inc
+!include ..\..\gtk\deprecated\Makefile.inc
+!include ..\..\gtk\inspector\Makefile.inc
+!include ..\..\gtk\Makefile.inc
 
 APIVERSION = 3.0
 
@@ -34,7 +41,75 @@ setgirbuildenv:
 	@set PKG_CONFIG_PATH=$(PKG_CONFIG_PATH)
 	@set LIB=vs$(VSVER)\$(CFG)\$(PLAT)\bin;$(LIB)
 
-!include introspection.body.mak
+gdk-introspect-list: ..\..\gdk\Makefile.inc
+	@echo Generating $@...
+	@$(PYTHON) -c "srcs='$(gdk_public_h_sources:		=) $(gdk_deprecated_h_sources:		=)';filter=['gdkkeysyms-compat.h'];result=[l for l in srcs.replace('/','\\').split() if l not in filter];result[0]='..\\..\\gdk\\' + result[0];f=open('$@', 'a');f.write('\n..\\..\\gdk\\'.join(result));f.close()"
+	@$(PYTHON) -c "srcs='$(gdk_c_sources:		=) $(gdk_built_sources:		=)';result=srcs.replace('/','\\').split();result[0]='\n..\\..\\gdk\\' + result[0];f=open('$@', 'a');f.write('\n..\\..\\gdk\\'.join(result));f.close()"
+
+gdk-win32-introspect-list: ..\..\gdk\Makefile.inc
+	@echo Generating $@...
+	@$(PYTHON) -c "srcs='$(w32_introspection_files:		=)';result=srcs.replace('/','\\').split();result[0]='..\\..\\gdk\\' + result[0];f=open('$@', 'a');f.write('\n..\\..\\gdk\\'.join(result));f.close()"
+
+gtk-introspect-list: ..\..\gtk\Makefile.inc
+	@echo Generating $@...
+	@$(PYTHON) -c "srcs='$(gtk_public_h_sources:		=) $(gtk_semi_private_h_sources:		=) $(gtk_built_public_sources:		=) gtkversion.h';filter=['gtktextdisplay.h', 'gtktextlayout.h', 'gtkx.h'];result=[l for l in srcs.replace('/','\\').split() if l not in filter];result[0]='..\\..\\gtk\\' + result[0];f=open('$@', 'a');f.write('\n..\\..\\gtk\\'.join(result));f.close()"
+	@$(PYTHON) -c "srcs='$(a11y_h_sources:		=) $(gtk_deprecated_h_sources:		=)';result=srcs.replace('/','\\').split();result[0]='\n..\\..\\gtk\\' + result[0];f=open('$@', 'a');f.write('\n..\\..\\gtk\\'.join(result));f.close()"
+	@$(PYTHON) -c "import re;srcs='$(a11y_c_sources:		=) $(gtk_deprecated_c_sources:		=) $(inspector_c_sources:		=) $(gtk_base_c_sources_base:		=)';filter=re.compile('(.*)win32.c');result=[l for l in srcs.replace('/','\\').split() if not filter.match(l)];result[0]='\n..\\..\\gtk\\' + result[0];f=open('$@', 'a');f.write('\n..\\..\\gtk\\'.join(result));f.close()"
+	@$(PYTHON) -c "srcs='gtkprintoperation-unix.c gtktypebuiltins.h gtktypebuiltins.c';result=srcs.replace('/','\\').split();result[0]='\n..\\..\\gtk\\' + result[0];f=open('$@', 'a');f.write('\n..\\..\\gtk\\'.join(result));f.close()"
+
+vs$(VSVER)\$(CFG)\$(PLAT)\bin\Gdk-$(APIVERSION).gir: vs$(VSVER)\$(CFG)\$(PLAT)\bin\gdk-$(APIVERSION).lib gdk-introspect-list
+	@echo Generating $@...
+	$(PYTHON) $(G_IR_SCANNER) --verbose -no-libtool	\
+	--namespace=Gdk --nsversion=$(APIVERSION) --library=gdk-$(APIVERSION)	\
+	--add-include-path=./$(@D:\=/) --add-include-path=$(G_IR_INCLUDEDIR)	\
+	--include=Gio-2.0 --include=GdkPixbuf-2.0 --include=Pango-1.0 --include=cairo-1.0	\
+	--pkg-export=gdk-$(APIVERSION)	\
+	--cflags-begin	\
+	$(GDK_PREPROCESSOR_FLAGS)	\
+	--cflags-end	\
+	--c-include=gdk/gdk.h --filelist=gdk-introspect-list	\
+	-L.\$(@D)	\
+	-o $@
+
+vs$(VSVER)\$(CFG)\$(PLAT)\bin\GdkWin32-$(APIVERSION).gir: vs$(VSVER)\$(CFG)\$(PLAT)\bin\Gdk-3.0.gir gdk-win32-introspect-list
+	@echo Generating $@...
+	$(PYTHON) $(G_IR_SCANNER) --verbose -no-libtool	\
+	--namespace=GdkWin32 --nsversion=$(APIVERSION)	\
+	--library=gdk-$(APIVERSION)	\
+	--add-include-path=./$(@D:\=/) --add-include-path=$(G_IR_INCLUDEDIR)	\
+	--cflags-begin	\
+	$(GDK_PREPROCESSOR_FLAGS)	\
+	--cflags-end	\
+	--identifier-prefix=Gdk --c-include=gdk/gdkwin32.h --include-uninstalled=./$(@D:\=/)/Gdk-3.0.gir	\
+	--filelist=gdk-win32-introspect-list	\
+	-L.\$(@D)	\
+	-o $@
+
+vs$(VSVER)\$(CFG)\$(PLAT)\bin\Gtk-3.0.gir: vs$(VSVER)\$(CFG)\$(PLAT)\bin\gtk-3.0.lib vs$(VSVER)\$(CFG)\$(PLAT)\bin\Gdk-3.0.gir gtk-introspect-list
+	@echo Generating $@...
+	$(PYTHON) $(G_IR_SCANNER) --verbose -no-libtool	\
+	--namespace=Gtk	--nsversion=$(APIVERSION)	\
+	--library=gtk-$(APIVERSION) --library=gdk-$(APIVERSION)	\
+	--add-include-path=./$(@D:\=/) --add-include-path=$(G_IR_INCLUDEDIR)	\
+	--include=Atk-1.0	\
+	--pkg-export=gtk+-$(APIVERSION)	\
+	--cflags-begin	\
+	-DG_LOG_USE_STRUCTURED=1 $(GTK_PREPROCESSOR_FLAGS:\"=\\\")	\
+	--cflags-end	\
+	--warn-all --include-uninstalled=./$(@D:\=/)/Gdk-3.0.gir	\
+	--filelist=gtk-introspect-list	\
+	-L.\$(@D)	\
+	-o $@
+
+vs$(VSVER)\$(CFG)\$(PLAT)\bin\Gdk-3.0.typelib: vs$(VSVER)\$(CFG)\$(PLAT)\bin\Gdk-3.0.gir
+vs$(VSVER)\$(CFG)\$(PLAT)\bin\GdkWin32-3.0.typelib: vs$(VSVER)\$(CFG)\$(PLAT)\bin\Gdk-3.0.typelib vs$(VSVER)\$(CFG)\$(PLAT)\bin\GdkWin32-3.0.gir
+vs$(VSVER)\$(CFG)\$(PLAT)\bin\Gtk-3.0.typelib: vs$(VSVER)\$(CFG)\$(PLAT)\bin\Gdk-3.0.typelib vs$(VSVER)\$(CFG)\$(PLAT)\bin\Gtk-3.0.gir
+
+vs$(VSVER)\$(CFG)\$(PLAT)\bin\Gdk-3.0.typelib	\
+vs$(VSVER)\$(CFG)\$(PLAT)\bin\GdkWin32-3.0.typelib	\
+vs$(VSVER)\$(CFG)\$(PLAT)\bin\Gtk-3.0.typelib:
+	@-echo Compiling $@...
+	$(G_IR_COMPILER) --includedir=$(@D:\=/) --debug --verbose $(@R:\=/).gir -o $@
 
 install-introspection: all
 	@-copy vs$(VSVER)\$(CFG)\$(PLAT)\bin\*.gir "$(G_IR_INCLUDEDIR)"
@@ -48,3 +123,4 @@ all:
 clean:
 	@-del /f/q vs$(VSVER)\$(CFG)\$(PLAT)\bin\*.typelib
 	@-del /f/q vs$(VSVER)\$(CFG)\$(PLAT)\bin\*.gir
+	@-del /f/q *-list

build/win32/introspection-msvc.mak

@@ -7,10 +7,6 @@
 # You will need to have built gobject-introspection for this to work.
 # Change or pass in or set the following to suit your environment
 
-!if "$(PREFIX)" == ""
-PREFIX = ..\..\..\vs$(VSVER)\$(PLAT)
-!endif
-
 !if ![setlocal]		&& \
     ![set PFX=$(PREFIX)]	&& \
     ![for %P in (%PFX%) do @echo PREFIX_FULL=%~dpnfP > pfx.x]
@@ -33,14 +29,6 @@ PKG_CONFIG_PATH=$(PREFIX_FULL)\lib\pkgconfig;$(PKG_CONFIG_PATH)
 
 # This is required, and gobject-introspection needs to be built
 # before this can be successfully run.
-!if "$(PYTHON)" == ""
-PYTHON=python
-!endif
-
-# Path to the pkg-config tool, if not already in the PATH
-!if "$(PKG_CONFIG)" == ""
-PKG_CONFIG=pkg-config
-!endif
 
 # Don't change anything following this line!
 

demos/gtk-demo/Makefile.am

@@ -1,87 +1,16 @@
 ## Makefile.am for gtk+/demos
 include $(top_srcdir)/Makefile.decl
 
-## These should be in the order you want them to appear in the
-## demo app, which means alphabetized by demo title, not filename
-demos_base =					\
-	application_demo.c			\
-	assistant.c				\
-	builder.c				\
-	button_box.c				\
-	changedisplay.c				\
-	clipboard.c				\
-	colorsel.c				\
-	combobox.c				\
-	css_accordion.c                         \
-	css_basics.c				\
-	css_blendmodes.c			\
-	css_multiplebgs.c			\
-	css_pixbufs.c				\
-	css_shadows.c				\
-	cursors.c				\
-	dialog.c				\
-	drawingarea.c				\
-	editable_cells.c			\
-	entry_buffer.c				\
-	entry_completion.c			\
-	event_axes.c				\
-	expander.c  				\
-        filtermodel.c				\
-	fishbowl.c				\
-	foreigndrawing.c			\
-	gestures.c				\
-	glarea.c				\
-	headerbar.c				\
-	hypertext.c				\
-	iconview.c				\
-	iconview_edit.c				\
-	images.c				\
-	infobar.c				\
-	links.c					\
-	listbox.c				\
-	flowbox.c				\
-	list_store.c				\
-	markup.c				\
-	menus.c					\
-	modelbutton.c				\
-	offscreen_window.c			\
-	offscreen_window2.c			\
-	overlay.c				\
-	overlay2.c				\
-	paint.c					\
-	panes.c					\
-	pickers.c				\
-	pixbufs.c				\
-	popover.c				\
-	printing.c				\
-	revealer.c				\
-	rotated_text.c				\
-	scale.c					\
-	search_entry.c				\
-	search_entry2.c				\
-	shortcuts.c				\
-	sidebar.c				\
-	sizegroup.c				\
-	spinbutton.c				\
-	spinner.c				\
-	stack.c					\
-	tabs.c					\
-	textmask.c				\
-	textview.c				\
-	textscroll.c				\
-	theming_style_classes.c			\
-	toolpalette.c				\
-	transparent.c				\
-	tree_store.c
+include $(srcdir)/Makefile.inc
 
 demos_opt =
 
 if BUILD_FONT_DEMO
-demos_opt += font_features.c
+demos_opt += $(font_features_demo)
 endif
 
 if OS_UNIX
-demos_opt += pagesetup.c
+demos_opt += $(page_setup_demo)
 endif
 
 demos = $(demos_base) $(demos_opt)

demos/gtk-demo/Makefile.inc

@@ -0,0 +1,75 @@
+## These should be in the order you want them to appear in the
+## demo app, which means alphabetized by demo title, not filename
+demos_base =					\
+	application_demo.c			\
+	assistant.c				\
+	builder.c				\
+	button_box.c				\
+	changedisplay.c				\
+	clipboard.c				\
+	colorsel.c				\
+	combobox.c				\
+	css_accordion.c                         \
+	css_basics.c				\
+	css_blendmodes.c			\
+	css_multiplebgs.c			\
+	css_pixbufs.c				\
+	css_shadows.c				\
+	cursors.c				\
+	dialog.c				\
+	drawingarea.c				\
+	editable_cells.c			\
+	entry_buffer.c				\
+	entry_completion.c			\
+	event_axes.c				\
+	expander.c  				\
+        filtermodel.c				\
+	fishbowl.c				\
+	foreigndrawing.c			\
+	gestures.c				\
+	glarea.c				\
+	headerbar.c				\
+	hypertext.c				\
+	iconview.c				\
+	iconview_edit.c				\
+	images.c				\
+	infobar.c				\
+	links.c					\
+	listbox.c				\
+	flowbox.c				\
+	list_store.c				\
+	markup.c				\
+	menus.c					\
+	modelbutton.c				\
+	offscreen_window.c			\
+	offscreen_window2.c			\
+	overlay.c				\
+	overlay2.c				\
+	paint.c					\
+	panes.c					\
+	pickers.c				\
+	pixbufs.c				\
+	popover.c				\
+	printing.c				\
+	revealer.c				\
+	rotated_text.c				\
+	scale.c					\
+	search_entry.c				\
+	search_entry2.c				\
+	shortcuts.c				\
+	sidebar.c				\
+	sizegroup.c				\
+	spinbutton.c				\
+	spinner.c				\
+	stack.c					\
+	tabs.c					\
+	textmask.c				\
+	textview.c				\
+	textscroll.c				\
+	theming_style_classes.c			\
+	toolpalette.c				\
+	transparent.c				\
+	tree_store.c
+
+font_features_demo = font_features.c
+page_setup_demo = pagesetup.c

gdk/Makefile.am

@@ -60,138 +60,14 @@ LDADD = 					\
 	-rpath $(libdir) 			\
 	$(no_undefined)
 
-#
-# setup source file variables
-#
-#
-# GDK header files for public installation (non-generated)
-#
-#
-gdk_public_h_sources = 				\
-	gdk.h					\
-	gdk-autocleanup.h			\
-	gdkapplaunchcontext.h			\
-	gdkcairo.h				\
-	gdkcursor.h				\
-	gdkdevice.h				\
-	gdkdevicepad.h				\
-	gdkdevicetool.h				\
-	gdkdevicemanager.h			\
-	gdkdisplay.h				\
-	gdkdisplaymanager.h			\
-	gdkdnd.h				\
-	gdkdrawingcontext.h			\
-	gdkevents.h				\
-	gdkframetimings.h			\
-	gdkglcontext.h				\
-	gdkkeys.h				\
-	gdkkeysyms.h				\
-	gdkkeysyms-compat.h			\
-	gdkmain.h				\
-	gdkmonitor.h				\
-	gdkpango.h				\
-	gdkframeclock.h				\
-	gdkpixbuf.h				\
-	gdkprivate.h				\
-	gdkproperty.h				\
-	gdkrectangle.h				\
-	gdkrgba.h				\
-	gdkscreen.h				\
-	gdkseat.h				\
-	gdkselection.h				\
-	gdktestutils.h				\
-	gdkthreads.h				\
-	gdktypes.h				\
-	gdkvisual.h				\
-	gdkwindow.h
+include $(srcdir)/Makefile.inc
 
-deprecated_h_sources =				\
-	deprecated/gdkcolor.h
+deprecated_h_sources = $(gdk_deprecated_h_sources)
 
 gdk_h_sources =					\
 	$(gdk_public_h_sources)			\
 	$(deprecated_h_sources)
 
-gdk_private_headers = 				\
-	gdk-private.h				\
-	gdkapplaunchcontextprivate.h		\
-	gdkconstructor.h		\
-	gdkcursorprivate.h			\
-	gdkdevicemanagerprivate.h		\
-	gdkdeviceprivate.h			\
-	gdkdevicepadprivate.h			\
-	gdkdevicetoolprivate.h			\
-	gdkdisplaymanagerprivate.h		\
-	gdkdisplayprivate.h			\
-	gdkdndprivate.h				\
-	gdkdrawingcontextprivate.h		\
-	gdkframeclockidle.h			\
-	gdkframeclockprivate.h			\
-	gdkglcontextprivate.h			\
-	gdkmonitorprivate.h			\
-	gdkprofilerprivate.h			\
-	gdkscreenprivate.h			\
-	gdkseatprivate.h			\
-	gdkseatdefaultprivate.h			\
-	gdkinternals.h				\
-	gdkintl.h				\
-	gdkkeysprivate.h			\
-	gdkvisualprivate.h			\
-	gdkx.h
-
-deprecated_c_sources =				\
-	deprecated/gdkcolor.c
-
-gdk_c_sources = 				\
-	$(deprecated_c_sources)			\
-	gdk-private.c				\
-	gdk.c					\
-	gdkapplaunchcontext.c			\
-	gdkcairo.c				\
-	gdkcursor.c				\
-	gdkdeprecated.c				\
-	gdkdevice.c				\
-	gdkdevicepad.c				\
-	gdkdevicetool.c				\
-	gdkdevicemanager.c			\
-	gdkdisplay.c				\
-	gdkdisplaymanager.c			\
-	gdkdnd.c				\
-	gdkdrawingcontext.c			\
-	gdkevents.c     			\
-	gdkframetimings.c			\
-	gdkgl.c					\
-	gdkglcontext.c				\
-	gdkglobals.c				\
-	gdkkeys.c				\
-	gdkkeyuni.c				\
-	gdkmonitor.c				\
-	gdkoffscreenwindow.c			\
-	gdkframeclock.c				\
-	gdkframeclockidle.c			\
-	gdkpango.c				\
-	gdkpixbuf-drawable.c			\
-	gdkprofiler.c				\
-	gdkproperty.c				\
-	gdkrectangle.c				\
-	gdkrgba.c				\
-	gdkscreen.c				\
-	gdkseat.c				\
-	gdkseatdefault.c			\
-	gdkselection.c				\
-	gdkvisual.c				\
-	gdkwindow.c				\
-	gdkwindowimpl.c
-
-gdk_built_sources = 				\
-	gdkenumtypes.h				\
-	gdkenumtypes.c				\
-	gdkmarshalers.h 			\
-	gdkmarshalers.c				\
-	gdkresources.h				\
-	gdkresources.c				\
-	gdkversionmacros.h
-
 #
 # setup GDK sources and their dependencies
 #
@@ -264,57 +140,6 @@ if OS_WIN32
 Gdk_3_0_gir_CFLAGS += -I$(srcdir)/win32 -I$(srcdir)
 endif
 if USE_X11
-x11_introspection_files = 		\
-	x11/gdkapplaunchcontext-x11.c	\
-	x11/gdkasync.c			\
-	x11/gdkcursor-x11.c		\
-	x11/gdkdevice-core-x11.c	\
-	x11/gdkdevicemanager-core-x11.c	\
-	x11/gdkdevicemanager-x11.c	\
-	x11/gdkdevicemanager-xi2.c	\
-	x11/gdkdevice-xi2.c		\
-	x11/gdkdisplay-x11.c		\
-	x11/gdkdisplaymanager-x11.c	\
-	x11/gdkdnd-x11.c		\
-	x11/gdkeventsource.c		\
-	x11/gdkeventtranslator.c	\
-	x11/gdkgeometry-x11.c		\
-	x11/gdkglcontext-x11.c		\
-	x11/gdkkeys-x11.c		\
-	x11/gdkmain-x11.c		\
-	x11/gdkmonitor-x11.c		\
-	x11/gdkproperty-x11.c		\
-	x11/gdkscreen-x11.c		\
-	x11/gdkselection-x11.c		\
-	x11/gdksettings.c		\
-	x11/gdktestutils-x11.c		\
-	x11/gdkvisual-x11.c		\
-	x11/gdkwindow-x11.c		\
-	x11/gdkxftdefaults.c		\
-	x11/gdkxid.c			\
-	x11/xsettings-client.c		\
-	x11/gdkx.h			\
-	x11/gdkx11applaunchcontext.h	\
-	x11/gdkx11cursor.h		\
-	x11/gdkx11device.h		\
-	x11/gdkx11device-core.h		\
-	x11/gdkx11device-xi2.h		\
-	x11/gdkx11devicemanager.h	\
-	x11/gdkx11devicemanager-core.h	\
-	x11/gdkx11devicemanager-xi2.h	\
-	x11/gdkx11display.h		\
-	x11/gdkx11displaymanager.h	\
-	x11/gdkx11dnd.h			\
-	x11/gdkx11glcontext.h		\
-	x11/gdkx11keys.h		\
-	x11/gdkx11monitor.h		\
-	x11/gdkx11property.h		\
-	x11/gdkx11screen.h		\
-	x11/gdkx11selection.h		\
-	x11/gdkx11utils.h		\
-	x11/gdkx11visual.h		\
-	x11/gdkx11window.h
-
 GdkX11-3.0.gir: libgdk-3.la Gdk-3.0.gir Makefile
 GdkX11_3_0_gir_SCANNERFLAGS = 		\
 	--identifier-prefix=Gdk		\
@@ -329,36 +154,6 @@ INTROSPECTION_GIRS += GdkX11-3.0.gir
 
 endif # USE_X11
 
-w32_introspection_files =		\
-	win32/gdkcursor-win32.c		\
-	win32/gdkdevicemanager-win32.c	\
-	win32/gdkdevice-virtual.c	\
-	win32/gdkdevice-win32.c		\
-	win32/gdkdevice-wintab.c	\
-	win32/gdkdisplaymanager-win32.c	\
-	win32/gdkdisplay-win32.c	\
-	win32/gdkdnd-win32.c		\
-	win32/gdkevents-win32.c		\
-	win32/gdkgeometry-win32.c	\
-	win32/gdkglobals-win32.c	\
-	win32/gdkkeys-win32.c		\
-	win32/gdkmain-win32.c		\
-	win32/gdkproperty-win32.c	\
-	win32/gdkscreen-win32.c		\
-	win32/gdkselection-win32.c	\
-	win32/gdktestutils-win32.c	\
-	win32/gdkwin32.h		\
-	win32/gdkwin32cursor.h		\
-	win32/gdkwin32display.h		\
-	win32/gdkwin32displaymanager.h	\
-	win32/gdkwin32dnd.h		\
-	win32/gdkwin32id.c		\
-	win32/gdkwin32keys.h		\
-	win32/gdkwin32misc.h		\
-	win32/gdkwin32screen.h		\
-	win32/gdkwin32window.h		\
-	win32/gdkwindow-win32.c
-
 if OS_WIN32
 GdkWin32-3.0.gir: libgdk-3.la Gdk-3.0.gir Makefile
 GdkWin32_3_0_gir_SCANNERFLAGS = \
@@ -517,46 +312,9 @@ gdk_3_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
-
-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 =	\
-	--identifier-prefix=Gdk		\
-	--c-include="gdk/gdkwin32.h"	\
-	--include-uninstalled='./vs$$$$(VSVER)/$$$$(CFG)/$$$$(PLAT)/bin/Gdk-3.0.gir'
-
-include $(top_srcdir)/build/Makefile.msvc-introspection
-
-else
-INTROSPECTION_INTERMEDIATE_ITEMS =
-endif
-
 dist-hook: \
 	$(top_builddir)/build/win32/vs9/gdk-3.vcproj	\
-	$(top_builddir)/build/win32/vs9/gdk-3.headers	\
-	$(INTROSPECTION_INTERMEDIATE_ITEMS)
+	$(top_builddir)/build/win32/vs9/gdk-3.headers
 
 DISTCLEANFILES = gdkconfig.h stamp-gc-h
 

gdk/Makefile.inc

@@ -0,0 +1,208 @@
+#
+# setup source file variables
+#
+#
+# GDK header files for public installation (non-generated)
+#
+#
+gdk_public_h_sources = 				\
+	gdk.h					\
+	gdk-autocleanup.h			\
+	gdkapplaunchcontext.h			\
+	gdkcairo.h				\
+	gdkcursor.h				\
+	gdkdevice.h				\
+	gdkdevicepad.h				\
+	gdkdevicetool.h				\
+	gdkdevicemanager.h			\
+	gdkdisplay.h				\
+	gdkdisplaymanager.h			\
+	gdkdnd.h				\
+	gdkdrawingcontext.h			\
+	gdkevents.h				\
+	gdkframetimings.h			\
+	gdkglcontext.h				\
+	gdkkeys.h				\
+	gdkkeysyms.h				\
+	gdkkeysyms-compat.h			\
+	gdkmain.h				\
+	gdkmonitor.h				\
+	gdkpango.h				\
+	gdkframeclock.h				\
+	gdkpixbuf.h				\
+	gdkprivate.h				\
+	gdkproperty.h				\
+	gdkrectangle.h				\
+	gdkrgba.h				\
+	gdkscreen.h				\
+	gdkseat.h				\
+	gdkselection.h				\
+	gdktestutils.h				\
+	gdkthreads.h				\
+	gdktypes.h				\
+	gdkvisual.h				\
+	gdkwindow.h
+
+gdk_deprecated_h_sources =			\
+	deprecated/gdkcolor.h
+
+gdk_private_headers = 				\
+	gdk-private.h				\
+	gdkapplaunchcontextprivate.h		\
+	gdkconstructor.h		\
+	gdkcursorprivate.h			\
+	gdkdevicemanagerprivate.h		\
+	gdkdeviceprivate.h			\
+	gdkdevicepadprivate.h			\
+	gdkdevicetoolprivate.h			\
+	gdkdisplaymanagerprivate.h		\
+	gdkdisplayprivate.h			\
+	gdkdndprivate.h				\
+	gdkdrawingcontextprivate.h		\
+	gdkframeclockidle.h			\
+	gdkframeclockprivate.h			\
+	gdkglcontextprivate.h			\
+	gdkmonitorprivate.h			\
+	gdkprofilerprivate.h			\
+	gdkscreenprivate.h			\
+	gdkseatprivate.h			\
+	gdkseatdefaultprivate.h			\
+	gdkinternals.h				\
+	gdkintl.h				\
+	gdkkeysprivate.h			\
+	gdkvisualprivate.h			\
+	gdkx.h
+
+gdk_deprecated_c_sources =			\
+	deprecated/gdkcolor.c
+
+gdk_c_sources = 				\
+	$(gdk_deprecated_c_sources)		\
+	gdk-private.c				\
+	gdk.c					\
+	gdkapplaunchcontext.c			\
+	gdkcairo.c				\
+	gdkcursor.c				\
+	gdkdeprecated.c				\
+	gdkdevice.c				\
+	gdkdevicepad.c				\
+	gdkdevicetool.c				\
+	gdkdevicemanager.c			\
+	gdkdisplay.c				\
+	gdkdisplaymanager.c			\
+	gdkdnd.c				\
+	gdkdrawingcontext.c			\
+	gdkevents.c     			\
+	gdkframetimings.c			\
+	gdkgl.c					\
+	gdkglcontext.c				\
+	gdkglobals.c				\
+	gdkkeys.c				\
+	gdkkeyuni.c				\
+	gdkmonitor.c				\
+	gdkoffscreenwindow.c			\
+	gdkframeclock.c				\
+	gdkframeclockidle.c			\
+	gdkpango.c				\
+	gdkpixbuf-drawable.c			\
+	gdkprofiler.c				\
+	gdkproperty.c				\
+	gdkrectangle.c				\
+	gdkrgba.c				\
+	gdkscreen.c				\
+	gdkseat.c				\
+	gdkseatdefault.c			\
+	gdkselection.c				\
+	gdkvisual.c				\
+	gdkwindow.c				\
+	gdkwindowimpl.c
+
+gdk_built_sources = 				\
+	gdkenumtypes.h				\
+	gdkenumtypes.c				\
+	gdkmarshalers.h 			\
+	gdkmarshalers.c				\
+	gdkresources.h				\
+	gdkresources.c				\
+	gdkversionmacros.h
+
+x11_introspection_files = 		\
+	x11/gdkapplaunchcontext-x11.c	\
+	x11/gdkasync.c			\
+	x11/gdkcursor-x11.c		\
+	x11/gdkdevice-core-x11.c	\
+	x11/gdkdevicemanager-core-x11.c	\
+	x11/gdkdevicemanager-x11.c	\
+	x11/gdkdevicemanager-xi2.c	\
+	x11/gdkdevice-xi2.c		\
+	x11/gdkdisplay-x11.c		\
+	x11/gdkdisplaymanager-x11.c	\
+	x11/gdkdnd-x11.c		\
+	x11/gdkeventsource.c		\
+	x11/gdkeventtranslator.c	\
+	x11/gdkgeometry-x11.c		\
+	x11/gdkglcontext-x11.c		\
+	x11/gdkkeys-x11.c		\
+	x11/gdkmain-x11.c		\
+	x11/gdkmonitor-x11.c		\
+	x11/gdkproperty-x11.c		\
+	x11/gdkscreen-x11.c		\
+	x11/gdkselection-x11.c		\
+	x11/gdksettings.c		\
+	x11/gdktestutils-x11.c		\
+	x11/gdkvisual-x11.c		\
+	x11/gdkwindow-x11.c		\
+	x11/gdkxftdefaults.c		\
+	x11/gdkxid.c			\
+	x11/xsettings-client.c		\
+	x11/gdkx.h			\
+	x11/gdkx11applaunchcontext.h	\
+	x11/gdkx11cursor.h		\
+	x11/gdkx11device.h		\
+	x11/gdkx11device-core.h		\
+	x11/gdkx11device-xi2.h		\
+	x11/gdkx11devicemanager.h	\
+	x11/gdkx11devicemanager-core.h	\
+	x11/gdkx11devicemanager-xi2.h	\
+	x11/gdkx11display.h		\
+	x11/gdkx11displaymanager.h	\
+	x11/gdkx11dnd.h			\
+	x11/gdkx11glcontext.h		\
+	x11/gdkx11keys.h		\
+	x11/gdkx11monitor.h		\
+	x11/gdkx11property.h		\
+	x11/gdkx11screen.h		\
+	x11/gdkx11selection.h		\
+	x11/gdkx11utils.h		\
+	x11/gdkx11visual.h		\
+	x11/gdkx11window.h
+
+w32_introspection_files =		\
+	win32/gdkcursor-win32.c		\
+	win32/gdkdevicemanager-win32.c	\
+	win32/gdkdevice-virtual.c	\
+	win32/gdkdevice-win32.c		\
+	win32/gdkdevice-wintab.c	\
+	win32/gdkdisplaymanager-win32.c	\
+	win32/gdkdisplay-win32.c	\
+	win32/gdkdnd-win32.c		\
+	win32/gdkevents-win32.c		\
+	win32/gdkgeometry-win32.c	\
+	win32/gdkglobals-win32.c	\
+	win32/gdkkeys-win32.c		\
+	win32/gdkmain-win32.c		\
+	win32/gdkproperty-win32.c	\
+	win32/gdkscreen-win32.c		\
+	win32/gdkselection-win32.c	\
+	win32/gdktestutils-win32.c	\
+	win32/gdkwin32.h		\
+	win32/gdkwin32cursor.h		\
+	win32/gdkwin32display.h		\
+	win32/gdkwin32displaymanager.h	\
+	win32/gdkwin32dnd.h		\
+	win32/gdkwin32id.c		\
+	win32/gdkwin32keys.h		\
+	win32/gdkwin32misc.h		\
+	win32/gdkwin32screen.h		\
+	win32/gdkwin32window.h		\
+	win32/gdkwindow-win32.c

gtk/Makefile.inc

@@ -0,0 +1,967 @@
+# GTK+ header files for public installation (non-generated, or generated
+# by configure)
+
+gtk_public_h_sources = 		\
+	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
+
+# Only used for *NIX builds
+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
+
+gtk_private_type_h_sources =	\
+	gtkcsstypesprivate.h	\
+	gtktexthandleprivate.h
+
+gtk_base_private_type_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	\
+	gtkimcontextsimpleprivate.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	\
+	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_c_sources_base =	\
+	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		\
+	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_clipboard_dnd_quartz_sources =	\
+	gtkclipboard-quartz.c	\
+	gtkdnd-quartz.c
+
+gtk_clipboard_dnd_generic_sources =	\
+	gtkclipboard.c 		\
+	gtkdnd.c		\
+	gtkdragdest.c
+
+gtk_dbus_built_sources = gtkdbusgenerated.c gtkdbusgenerated.h
+
+gtk_os_unix_c_sources = 		\
+	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_win32_c_sources = \
+	gtkprint-win32.c		\
+	gtkprintoperation-win32.c	\
+	gtkfilechoosernativewin32.c	\
+	gtkwin32.c
+
+gtk_os_win32_private_h_sources = gtkprint-win32.h
+
+gtk_use_x11_c_sources = 	\
+	gtkplug.c		\
+	gtksocket.c		\
+	gtkxembed.c		\
+	deprecated/gtktrayicon-x11.c	\
+	gtkapplication-x11.c	\
+	gtkmountoperation-x11.c
+
+gtk_use_wayland_c_sources = \
+	gtkapplication-wayland.c
+
+gtk_use_wayland_or_x11_c_sources = \
+	gtkapplication-dbus.c
+
+gtk_use_win32_c_sources = 	\
+	gtkwin32embed.c		\
+	gtkwin32embedwidget.c	\
+	gtkmountoperation-stub.c
+
+gtk_use_quartz_c_sources = 	\
+	gtksearchenginequartz.c	\
+	gtkmountoperation-stub.c \
+	gtkapplication-quartz.c \
+	gtkapplication-quartz-menu.c \
+	gtkfilechoosernativequartz.c \
+	gtkquartz.c
+
+gtk_use_stub_c_sources = 	\
+	gtkmountoperation-stub.c
+
+gtk_use_x11_private_h_sources = 	\
+	gtkxembed.h		\
+	deprecated/gtktrayicon.h	\
+	xembed.h
+
+gtk_use_win32_private_h_sources = 	\
+	gtkwin32embed.h		\
+	gtkwin32embedwidget.h
+
+
+# built sources that get installed with the header files
+gtk_built_public_sources =			\
+	gtktypebuiltins.h
+
+# built headers that don't get installed
+gtk_built_private_headers =			\
+	gtkresources.h				\
+	gtkmarshalers.h				\
+	gtkprivatetypebuiltins.h
+
+gtk_built_sources =				\
+	$(gtk_built_private_headers)		\
+	$(gtk_built_public_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

gtk/deprecated/Makefile.inc

@@ -1,4 +1,4 @@
-deprecated_h_sources = 			\
+gtk_deprecated_h_sources = 			\
 	deprecated/gtkactivatable.h	\
 	deprecated/gtkaction.h		\
 	deprecated/gtkactiongroup.h	\
@@ -40,14 +40,14 @@ deprecated_h_sources = 			\
 	deprecated/gtkvseparator.h	\
 	deprecated/gtkvpaned.h
 
-deprecated_private_h_sources =			\
+gtk_deprecated_private_h_sources =		\
 	deprecated/gtkgradientprivate.h		\
 	deprecated/gtkiconfactoryprivate.h	\
 	deprecated/gtknumerableiconprivate.h	\
 	deprecated/gtkstylepropertiesprivate.h	\
 	deprecated/gtksymboliccolorprivate.h
 
-deprecated_c_sources = 			\
+gtk_deprecated_c_sources = 			\
 	deprecated/gtkactivatable.c	\
 	deprecated/gtkaction.c		\
 	deprecated/gtkactiongroup.c	\