[gimp] Makefiles: don't use -xobjective-c when compiling C++ files on Mac

[N/A <ell src gnome org>]

commit 06950be7f0a10145c9e7c4f60d0afcb58dba89a5
Author: Ell <ell_se yahoo com>
Date:   Sat Apr 7 16:39:13 2018 -0400

    Makefiles: don't use -xobjective-c when compiling C++ files on Mac
    
    On Mac, pass -xobjective-c to the compiler through AM_CFLAGS, not
    AM_CPPFLAGS, so that it's only used for C sources, and not C++
    sources.  In the latter case, it clashes with the -std=... flag,
    spewing an error.  Thanks, Partha :)

 app-tools/Makefile.am          |    4 +++-
 app/core/Makefile.am           |    4 +++-
 app/display/Makefile.am        |    4 +++-
 app/gui/Makefile.am            |    4 +++-
 app/widgets/Makefile.am        |    4 +++-
 libgimp/Makefile.am            |    4 +++-
 libgimpbase/Makefile.am        |    4 +++-
 libgimpthumb/Makefile.am       |    4 +++-
 libgimpwidgets/Makefile.am     |    4 +++-
 plug-ins/script-fu/Makefile.am |    6 +++---
 tools/Makefile.am              |    4 +++-
 11 files changed, 33 insertions(+), 13 deletions(-)
---
diff --git a/app-tools/Makefile.am b/app-tools/Makefile.am
index 7195d36..25fa220 100644
--- a/app-tools/Makefile.am
+++ b/app-tools/Makefile.am
@@ -67,5 +67,7 @@ AM_CPPFLAGS = \
        -DGIMP_PLUGIN_VERSION=\""$(GIMP_PLUGIN_VERSION)"\"      \
        -I$(top_srcdir)                                         \
        $(GTK_CFLAGS)                                           \
-       -I$(includedir)                                         \
+       -I$(includedir)
+
+AM_CFLAGS = \
        $(xobjective_c)
diff --git a/app/core/Makefile.am b/app/core/Makefile.am
index 7634dbf..a994d37 100644
--- a/app/core/Makefile.am
+++ b/app/core/Makefile.am
@@ -18,7 +18,9 @@ AM_CPPFLAGS = \
        $(GDK_PIXBUF_CFLAGS)                            \
        $(LIBMYPAINT_CFLAGS)                            \
        $(GEXIV2_CFLAGS)                                \
-       -I$(includedir)                                 \
+       -I$(includedir)
+
+AM_CFLAGS = \
        $(xobjective_c)
 
 noinst_LIBRARIES = libappcore.a
diff --git a/app/display/Makefile.am b/app/display/Makefile.am
index 5df014e..5af95dd 100644
--- a/app/display/Makefile.am
+++ b/app/display/Makefile.am
@@ -12,7 +12,9 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/app             \
        $(GEGL_CFLAGS)                  \
        $(GTK_CFLAGS)                   \
-       -I$(includedir)                 \
+       -I$(includedir)
+
+AM_CFLAGS = \
        $(xobjective_c)
 
 noinst_LIBRARIES = libappdisplay.a
diff --git a/app/gui/Makefile.am b/app/gui/Makefile.am
index 0ea4d0d..52d0233 100644
--- a/app/gui/Makefile.am
+++ b/app/gui/Makefile.am
@@ -11,7 +11,6 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)                         \
        -I$(top_builddir)/app                   \
        -I$(top_srcdir)/app                     \
-       $(xobjective_c)                         \
        $(GIO_UNIX_CFLAGS)                      \
        $(GEGL_CFLAGS)                          \
        $(GTK_CFLAGS)                           \
@@ -19,6 +18,9 @@ AM_CPPFLAGS = \
        $(DBUS_GLIB_CFLAGS)                     \
        -I$(includedir)
 
+AM_CFLAGS = \
+       $(xobjective_c)
+
 noinst_LIBRARIES = libappgui.a
 
 libappgui_a_sources = \
diff --git a/app/widgets/Makefile.am b/app/widgets/Makefile.am
index 4118712..2594dc0 100644
--- a/app/widgets/Makefile.am
+++ b/app/widgets/Makefile.am
@@ -14,7 +14,9 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/app                                     \
        $(GEGL_CFLAGS)                                          \
        $(GTK_CFLAGS)                                           \
-       -I$(includedir)                                         \
+       -I$(includedir)
+
+AM_CFLAGS = \
        $(xobjective_c)
 
 noinst_LIBRARIES = libappwidgets.a
diff --git a/libgimp/Makefile.am b/libgimp/Makefile.am
index 141f857..9817e8f 100644
--- a/libgimp/Makefile.am
+++ b/libgimp/Makefile.am
@@ -75,7 +75,9 @@ AM_CPPFLAGS = \
        $(GTK_CFLAGS)                   \
        $(GEGL_CFLAGS)                  \
        $(GEXIV2_CFLAGS)                \
-       -I$(includedir)                 \
+       -I$(includedir)
+
+AM_CFLAGS = \
        $(xobjective_c)
 
 lib_LTLIBRARIES = libgimp-@GIMP_API_VERSION@.la libgimpui-@GIMP_API_VERSION@.la
diff --git a/libgimpbase/Makefile.am b/libgimpbase/Makefile.am
index 2f3ac24..3825eb9 100644
--- a/libgimpbase/Makefile.am
+++ b/libgimpbase/Makefile.am
@@ -64,7 +64,9 @@ AM_CPPFLAGS = \
        $(GIO_CFLAGS)                                           \
        $(GEXIV2_CFLAGS)                                        \
        $(BINRELOC_CFLAGS)                                      \
-       -I$(includedir)                                         \
+       -I$(includedir)
+
+AM_CFLAGS = \
        $(xobjective_c)
 
 AM_CCASFLAGS = \
diff --git a/libgimpthumb/Makefile.am b/libgimpthumb/Makefile.am
index ecb9933..d7782d4 100644
--- a/libgimpthumb/Makefile.am
+++ b/libgimpthumb/Makefile.am
@@ -50,7 +50,9 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)                 \
        $(GDK_PIXBUF_CFLAGS)            \
        $(GIO_CFLAGS)                   \
-       -I$(includedir)                 \
+       -I$(includedir)
+
+AM_CFLAGS = \
        $(xobjective_c)
 
 EXTRA_DIST = \
diff --git a/libgimpwidgets/Makefile.am b/libgimpwidgets/Makefile.am
index 032be6e..52ea5a2 100644
--- a/libgimpwidgets/Makefile.am
+++ b/libgimpwidgets/Makefile.am
@@ -58,7 +58,9 @@ AM_CPPFLAGS = \
        $(GEGL_CFLAGS)                          \
        $(GTK_CFLAGS)                           \
        $(LCMS_CFLAGS)                          \
-       -I$(includedir)                         \
+       -I$(includedir)
+
+AM_CFLAGS = \
        $(xobjective_c)
 
 lib_LTLIBRARIES = libgimpwidgets-@GIMP_API_VERSION@.la
diff --git a/plug-ins/script-fu/Makefile.am b/plug-ins/script-fu/Makefile.am
index 90b449f..70874e3 100644
--- a/plug-ins/script-fu/Makefile.am
+++ b/plug-ins/script-fu/Makefile.am
@@ -31,14 +31,14 @@ endif
 AM_CFLAGS = \
        -DSTANDALONE=0          \
        -DUSE_INTERFACE=1       \
-       -DUSE_STRLWR=0
+       -DUSE_STRLWR=0          \
+       $(xobjective_c)
 
 AM_CPPFLAGS = \
        -I$(top_srcdir) \
        $(GTK_CFLAGS)   \
        $(GEGL_CFLAGS)  \
-       -I$(includedir) \
-       $(xobjective_c)
+       -I$(includedir)
 
 AM_LDFLAGS = \
        $(mwindows)     \
diff --git a/tools/Makefile.am b/tools/Makefile.am
index e61b34a..31d2750 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -87,7 +87,9 @@ AM_CPPFLAGS = \
        -DGIMP_PLUGIN_VERSION=\""$(GIMP_PLUGIN_VERSION)"\"      \
        -I$(top_srcdir)                                         \
        $(GTK_CFLAGS)                                           \
-       -I$(includedir)                                         \
+       -I$(includedir)
+
+AM_CFLAGS = \
        $(xobjective_c)
 
 EXTRA_DIST = \