[gtk/gtk-2-24] [gdk|gtk]/Makefile.am: Fix CFlags passed to introspecion on MSVC

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

commit 639688d37e5baef457f3dd83b5962c41275b4d5d
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Fri Dec 21 13:02:05 2018 +0800

    [gdk|gtk]/Makefile.am: Fix CFlags passed to introspecion on MSVC
    
    Don't pass in G_LOG_DOMAIN=\"...\" to the CFlags that is passed into the
    generation the NMake Makefiles.  This will avoid the introspection scanner
    from choking because the resulting NMake Makefiles may not have that
    CFlag escaped properly, and it is not really needed for building the
    introspection binary.

 gdk/Makefile.am | 1 -
 gtk/Makefile.am | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)
---
diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index 170eed2439..ad2ef201bc 100644
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -391,7 +391,6 @@ if HAVE_INTROSPECTION
 MSVC_INTROSPECT_GIRS = Gdk-2.0.gir
 
 BASE_MSVC_GIR_CFLAGS =                 \
-       -DG_LOG_DOMAIN=\"Gdk\"          \
        -DGDK_COMPILATION               \
        -I../.. -I../../gdk -I.../../gdk/win32
 
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 8cc453600d..c6c8db1c53 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -34,7 +34,6 @@ endif
 endif
 
 GTK_BASE_CFLAGS_DEFINES =                              \
-       -DG_LOG_DOMAIN=\"Gtk\"                          \
        -DGTK_VERSION=\"$(GTK_VERSION)\"                \
        -DGTK_BINARY_VERSION=\"$(GTK_BINARY_VERSION)\"  \
        -DGTK_COMPILATION                               \
@@ -54,6 +53,7 @@ GTK_PLAT_CFLAGS_DEFINES =                             \
 INCLUDES =                                             \
        $(GTK_BASE_CFLAGS_DEFINES)                      \
        $(GTK_PLAT_CFLAGS_DEFINES)                      \
+       -DG_LOG_DOMAIN=\"Gtk\"                          \
        -I$(top_builddir)                               \
        -I$(top_builddir)/gtk                           \
        -I$(top_srcdir) -I../gdk                        \