[gtk+] autotools: Update MSVC gir build script generation

[Chun-wei Fan <fanchunwei src gnome org>]

commit 53077f15d86e4c0dce40af4e2eb804112744b933
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Thu Nov 3 18:00:03 2016 +0800

    autotools: Update MSVC gir build script generation
    
    Now that GTK+ is built as a single DLL, and the .lib that is built is
    gtk-4.lib, we need to update the autotools sections in generating the
    NMake Makefile snippets so that we can have the correct commands and flags
    for building the .gir files, which will all now link to gtk-4-vsXX.dll (or
    so).

 gdk/Makefile.am |   12 ++++++------
 gsk/Makefile.am |    8 ++++----
 gtk/Makefile.am |    2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)
---
diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index e933cb0..fb9be18 100644
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -491,20 +491,20 @@ INTROSPECTION_INTERMEDIATE_ITEMS = \
        $(top_builddir)/build/win32/GdkWin32_4_0_gir_list
 
 Gdk_4_0_gir_MSVC_FILES = $(introspection_files)
-Gdk_4_0_gir_MSVC_EXPORT_PACKAGES = $(Gdk_4_0_gir_EXPORT_PACKAGES)
-Gdk_4_0_gir_MSVC_INCLUDE_GIRS = $(Gdk_4_0_gir_INCLUDES)
-Gdk_4_0_gir_MSVC_LIBS = gdk-4.0
+Gdk_4_0_gir_MSVC_EXPORT_PACKAGES = $(Gdk_noinst_4_0_gir_EXPORT_PACKAGES)
+Gdk_4_0_gir_MSVC_INCLUDE_GIRS = $(Gdk_noinst_4_0_gir_INCLUDES)
+Gdk_4_0_gir_MSVC_LIBS = gtk-4
 Gdk_4_0_gir_MSVC_CFLAGS = $(BASE_MSVC_GIR_CFLAGS)
-Gdk_4_0_gir_MSVC_SCANNERFLAGS = $(Gdk_4_0_gir_SCANNERFLAGS)
+Gdk_4_0_gir_MSVC_SCANNERFLAGS = $(Gdk_noinst_4_0_gir_SCANNERFLAGS)
 
 GdkWin32_4_0_gir_MSVC_FILES = $(w32_introspection_files)
-GdkWin32_4_0_gir_MSVC_INCLUDE_GIRS = $(GdkWin32_4_0_gir_INCLUDES)
+GdkWin32_4_0_gir_MSVC_INCLUDE_GIRS = $(GdkWin32_noinst_4_0_gir_INCLUDES)
 GdkWin32_4_0_gir_MSVC_LIBS = $(Gdk_4_0_gir_MSVC_LIBS)
 GdkWin32_4_0_gir_MSVC_CFLAGS = $(BASE_MSVC_GIR_CFLAGS)
 GdkWin32_4_0_gir_MSVC_SCANNERFLAGS =   \
        --identifier-prefix=Gdk         \
        --c-include="gdk/gdkwin32.h"    \
-       --include-uninstalled=./Gdk-noinst-4.0.gir
+       --include-uninstalled=./Gdk-4.0.gir
 
 include $(top_srcdir)/build/Makefile.msvc-introspection
 
diff --git a/gsk/Makefile.am b/gsk/Makefile.am
index c920fdc..26aced1 100644
--- a/gsk/Makefile.am
+++ b/gsk/Makefile.am
@@ -184,13 +184,13 @@ INTROSPECTION_INTERMEDIATE_ITEMS = \
        $(top_builddir)/build/win32/gsk.enum.headers
 
 Gsk_4_0_gir_MSVC_FILES = $(introspection_files)
-Gsk_4_0_gir_MSVC_EXPORT_PACKAGES = $(Gsk_4_0_gir_EXPORT_PACKAGES)
-Gsk_4_0_gir_MSVC_INCLUDE_GIRS = $(Gsk_4_0_gir_INCLUDES)
-Gsk_4_0_gir_MSVC_LIBS = gsk-4.0
+Gsk_4_0_gir_MSVC_EXPORT_PACKAGES = $(Gsk_noinst_4_0_gir_EXPORT_PACKAGES)
+Gsk_4_0_gir_MSVC_INCLUDE_GIRS = $(Gsk_noinst_4_0_gir_INCLUDES)
+Gsk_4_0_gir_MSVC_LIBS = gtk-4
 Gsk_4_0_gir_MSVC_CFLAGS = $(BASE_MSVC_GIR_CFLAGS)
 Gsk_4_0_gir_MSVC_SCANNERFLAGS =                        \
        --add-include-path=.                    \
-       --include-uninstalled=../gdk/Gdk-noinst-4.0.gir
+       --include-uninstalled=../gdk/Gdk-4.0.gir
 
 include $(top_srcdir)/build/Makefile.msvc-introspection
 
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 7eaf237..3fa3e58 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -1458,7 +1458,7 @@ Gtk_4_0_gir_MSVC_FILES =          \
 
 Gtk_4_0_gir_MSVC_EXPORT_PACKAGES = $(Gtk_4_0_gir_EXPORT_PACKAGES)
 Gtk_4_0_gir_MSVC_INCLUDE_GIRS = Atk-1.0
-Gtk_4_0_gir_MSVC_LIBS = gtk-4.0 gdk-4.0
+Gtk_4_0_gir_MSVC_LIBS = gtk-4
 Gtk_4_0_gir_MSVC_CFLAGS = $(GTK_MSVC_GIR_CFLAGS)
 Gtk_4_0_gir_MSVC_SCANNERFLAGS = --warn-all --add-include-path=. --include-uninstalled=./Gdk-4.0.gir 
--include-uninstalled=./Gsk-4.0.gir