[gnome-commander] Adds checks to only include gtk/gtk.h in src files directly

[Uwe Scholz <uwescholz src gnome org>]

commit 9896ffcac9eb491193fe2ef241a499bb61896c63
Author: Uwe Scholz <uwescholz src gnome org>
Date:   Fri May 12 14:12:12 2017 +0200

    Adds checks to only include gtk/gtk.h in src files directly

 libgcmd/Makefile.am            |    5 +++--
 plugins/fileroller/Makefile.am |    4 +++-
 plugins/test/Makefile.am       |    4 +++-
 src/Makefile.am                |    2 ++
 src/dialogs/Makefile.am        |    2 ++
 src/intviewer/Makefile.am      |    4 +++-
 src/tags/Makefile.am           |    2 ++
 tests/Makefile.am              |    4 +++-
 8 files changed, 21 insertions(+), 6 deletions(-)
---
diff --git a/libgcmd/Makefile.am b/libgcmd/Makefile.am
index 0a37d12..5ace011 100644
--- a/libgcmd/Makefile.am
+++ b/libgcmd/Makefile.am
@@ -5,7 +5,9 @@ AM_LDFLAGS = $(WARN_LDFLAGS)
 
 AM_CPPFLAGS = \
        $(GNOMEUI_CFLAGS) \
-       $(GNOMEVFS_CFLAGS)
+       $(GNOMEVFS_CFLAGS) \
+       -DGTK_DISABLE_SINGLE_INCLUDES \
+       -DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES
 
 pkglib_LTLIBRARIES = libgcmd.la
 
@@ -21,7 +23,6 @@ libgcmd_la_SOURCES = \
        libgcmd-deps.h \
        libgcmd.h
 
-
 libgcmd_la_LIBADD = $(GNOMEUI_LIBS) $(GNOMEVFS_LIBS)
 libgcmd_la_LDFLAGS = $(GNOMEUI_LIBS) $(GNOMEVFS_LIBS)
 
diff --git a/plugins/fileroller/Makefile.am b/plugins/fileroller/Makefile.am
index 631e3ab..67f996f 100644
--- a/plugins/fileroller/Makefile.am
+++ b/plugins/fileroller/Makefile.am
@@ -6,7 +6,9 @@ AM_LDFLAGS = $(WARN_LDFLAGS)
 AM_CPPFLAGS = \
        -I$(top_srcdir) \
        $(GNOMEUI_CFLAGS) \
-       $(GNOMEVFS_CFLAGS)
+       $(GNOMEVFS_CFLAGS) \
+       -DGTK_DISABLE_SINGLE_INCLUDES \
+       -DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES
 
 plugindir = $(pkglibdir)/plugins
 
diff --git a/plugins/test/Makefile.am b/plugins/test/Makefile.am
index c375925..3708a11 100644
--- a/plugins/test/Makefile.am
+++ b/plugins/test/Makefile.am
@@ -6,7 +6,9 @@ AM_LDFLAGS = $(WARN_LDFLAGS)
 AM_CPPFLAGS = \
        -I$(top_srcdir) \
        $(GNOMEUI_CFLAGS) \
-       $(GNOMEVFS_CFLAGS)
+       $(GNOMEVFS_CFLAGS) \
+       -DGTK_DISABLE_SINGLE_INCLUDES \
+       -DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES
 
 plugindir = $(pkglibdir)/plugins
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 058aa18..b2dcc89 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -12,6 +12,8 @@ AM_CPPFLAGS = \
        $(GNOME_KEYRING_CFLAGS) \
        $(UNIQUE_CFLAGS) \
        $(PYTHON_CFLAGS) \
+       -DGTK_DISABLE_SINGLE_INCLUDES \
+       -DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES \
        -DDATADIR=\""$(datadir)"\"\
        -DPLUGIN_DIR=\""$(libdir)/$(PACKAGE)/plugins"\" \
        -DMIMETOP_DIR=\""$(datadir)/@PACKAGE@/"\"
diff --git a/src/dialogs/Makefile.am b/src/dialogs/Makefile.am
index 1c2a839..23381a6 100644
--- a/src/dialogs/Makefile.am
+++ b/src/dialogs/Makefile.am
@@ -15,6 +15,8 @@ AM_CPPFLAGS = \
        $(CHM_CFLAGS) \
        $(GSF_CFLAGS) \
        $(POPPLER_CFLAGS) \
+       -DGTK_DISABLE_SINGLE_INCLUDES \
+       -DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES \
        -DPLUGIN_DIR=\""$(libdir)/$(PACKAGE)/plugins"\"
 
 libgcmd_dialogs_a_SOURCES = \
diff --git a/src/intviewer/Makefile.am b/src/intviewer/Makefile.am
index a8c53b3..9d7c6d0 100644
--- a/src/intviewer/Makefile.am
+++ b/src/intviewer/Makefile.am
@@ -9,7 +9,9 @@ AM_CPPFLAGS = \
        $(GLIB_CFLAGS) \
        $(GTK_CFLAGS) \
        $(GNOMEUI_CFLAGS) \
-       $(GNOMEVFS_CFLAGS)
+       $(GNOMEVFS_CFLAGS) \
+       -DGTK_DISABLE_SINGLE_INCLUDES \
+       -DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES
 
 noinst_LIBRARIES = libgviewer.a
 
diff --git a/src/tags/Makefile.am b/src/tags/Makefile.am
index be5aadd..6f14e2b 100644
--- a/src/tags/Makefile.am
+++ b/src/tags/Makefile.am
@@ -15,6 +15,8 @@ AM_CPPFLAGS = \
        $(CHM_CFLAGS) \
        $(GSF_CFLAGS) \
        $(POPPLER_CFLAGS) \
+       -DGTK_DISABLE_SINGLE_INCLUDES \
+       -DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES \
        -DPLUGIN_DIR=\""$(libdir)/$(PACKAGE)/plugins"\"
 
 libgcmd_tags_a_SOURCES = \
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 0bb21d3..8d0a7ac 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -13,7 +13,9 @@ AM_CPPFLAGS = \
        -I$(top_srcdir) \
        -I$(top_srcdir)/src \
        -I$(top_srcdir)/src/intviewer \
-       -I$(srcdir)
+       -I$(srcdir) \
+       -DGTK_DISABLE_SINGLE_INCLUDES \
+       -DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES
 
 INTVLIBS = \
        $(GLIB_LIBS) \