[gtk/split-out-gdk-gtk-source-list-3-24: 11/11] autotools build: Don't generate NMake snippets for introspection

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

commit 3edbb7583128132f01a9f1b6e1ca06d34241fdce
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Wed Jul 31 20:32:16 2019 +0800

    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 | 128 --------------------------------------
 build/win32/Makefile.am           |  29 +--------
 gdk/Makefile.am                   |  39 +-----------
 gtk/Makefile.am                   |  53 +---------------
 4 files changed, 3 insertions(+), 246 deletions(-)
---
diff --git a/build/win32/Makefile.am b/build/win32/Makefile.am
index c83b78bf45..36fa0388a5 100644
--- a/build/win32/Makefile.am
+++ b/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
diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index 807e2a6a47..a855d525b3 100644
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -312,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
 
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 98bb69ccac..c9e7ea1524 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -583,60 +583,9 @@ gtk_3_HEADERS_EXCLUDES = dummy
 
 include $(top_srcdir)/build/Makefile.msvcproj
 
-if HAVE_INTROSPECTION
-# Introspection Items for MSVC
-MSVC_INTROSPECT_GIRS = Gtk-3.0.gir
-
-GTK_MSVC_GIR_CFLAGS =                                          \
-       $(GTK_BASE_CFLAGS_DEFINES)                              \
-       -DGTK_LIBDIR=\\\"/dummy/lib\\\"                         \
-       -DGTK_DATADIR=\\\"/dummy/share\\\"                      \
-       -DGTK_DATA_PREFIX=\\\"/dummy\\\"                        \
-       -DGTK_SYSCONFDIR=\\\"/dummy/etc\\\"                     \
-       -DGTK_HOST=\\\"'$$$$(AT_PLAT)'-pc-vs'$$$$(VSVER)'\\\"   \
-       -DGTK_PRINT_BACKENDS=\\\"file\\\"                       \
-       -DINCLUDE_IM_am_et                      \
-       -DINCLUDE_IM_cedilla                    \
-       -DINCLUDE_IM_cyrillic_translit          \
-       -DINCLUDE_IM_ime                        \
-       -DINCLUDE_IM_inuktitu                   \
-       -DINCLUDE_IM_ipa                        \
-       -DINCLUDE_IM_multipress                 \
-       -DINCLUDE_IM_thai                       \
-       -DINCLUDE_IM_ti_er                      \
-       -DINCLUDE_IM_ti_et                      \
-       -DINCLUDE_IM_viqr                       \
-       -DGTK_TEXT_USE_INTERNAL_UNSUPPORTED_API \
-       -I../.. -I../../gtk -I../../gdk
-
-INTROSPECTION_INTERMEDIATE_ITEMS = \
-       $(top_builddir)/build/win32/Gtk-3.0.gir.msvc.introspect         \
-       $(top_builddir)/build/win32/Gtk_3_0_gir_list
-
-Gtk_3_0_gir_MSVC_FILES =               \
-       $(introspected_pub_headers)     \
-       $(gtk_base_c_sources)           \
-       $(gtk_os_win32_c_sources)       \
-       gtktypebuiltins.h               \
-       gtktypebuiltins.c
-
-Gtk_3_0_gir_MSVC_EXPORT_PACKAGES = $(Gtk_3_0_gir_EXPORT_PACKAGES)
-Gtk_3_0_gir_MSVC_INCLUDE_GIRS = Atk-1.0
-Gtk_3_0_gir_MSVC_LIBS = gtk-3.0 gdk-3.0
-Gtk_3_0_gir_MSVC_CFLAGS = $(GTK_MSVC_GIR_CFLAGS)
-Gtk_3_0_gir_MSVC_SCANNERFLAGS = --warn-all 
--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/gtk-3.vcproj    \
-       $(top_builddir)/build/win32/vs9/gtk-3.headers   \
-       $(INTROSPECTION_INTERMEDIATE_ITEMS)
+       $(top_builddir)/build/win32/vs9/gtk-3.headers
 
 # 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