[gimp] */Makefile.am: merge INCLUDES into AM_CPPFLAGS

From: Michael Natterer <mitch src gnome org>
To: commits-list gnome org
Cc:
Subject: [gimp] */Makefile.am: merge INCLUDES into AM_CPPFLAGS
Date: Wed, 5 Jun 2013 18:50:53 +0000 (UTC)
commit ec786816bb4b0178e2af188c48dd93194b01ca0f
Author: Michael Natterer <mitch gimp org>
Date:   Wed Jun 5 20:48:37 2013 +0200

    */Makefile.am: merge INCLUDES into AM_CPPFLAGS
    
    automake-1.13 finally warns about this anachronism.

 app/Makefile.am                        |   14 ++++-----
 app/actions/Makefile.am                |   16 +++++------
 app/config/Makefile.am                 |   20 ++++++-------
 app/core/Makefile.am                   |   18 +++++-------
 app/dialogs/Makefile.am                |   16 +++++------
 app/display/Makefile.am                |   16 +++++------
 app/file/Makefile.am                   |   16 +++++------
 app/gegl/Makefile.am                   |   18 +++++-------
 app/gui/Makefile.am                    |   22 +++++++--------
 app/menus/Makefile.am                  |   16 +++++------
 app/operations/Makefile.am             |   18 +++++-------
 app/paint/Makefile.am                  |   18 +++++-------
 app/pdb/Makefile.am                    |   18 +++++-------
 app/plug-in/Makefile.am                |   18 +++++-------
 app/text/Makefile.am                   |   18 +++++-------
 app/tools/Makefile.am                  |   16 +++++------
 app/vectors/Makefile.am                |   18 +++++-------
 app/widgets/Makefile.am                |   16 +++++------
 app/xcf/Makefile.am                    |   18 +++++-------
 devel-docs/tools/Makefile.am           |    8 +++---
 libgimp/Makefile.am                    |   12 +++-----
 libgimpbase/Makefile.am                |   14 ++++-----
 libgimpcolor/Makefile.am               |   12 +++-----
 libgimpconfig/Makefile.am              |   12 +++-----
 libgimpmath/Makefile.am                |    8 ++---
 libgimpmodule/Makefile.am              |   10 +++----
 libgimpthumb/Makefile.am               |   12 +++-----
 libgimpwidgets/Makefile.am             |   10 +++----
 modules/Makefile.am                    |    2 +-
 plug-ins/color-rotate/Makefile.am      |    2 +-
 plug-ins/common/Makefile.am            |    2 +-
 plug-ins/common/mkgen.pl               |    2 +-
 plug-ins/file-bmp/Makefile.am          |    2 +-
 plug-ins/file-compressor/Makefile.am   |    2 +-
 plug-ins/file-exr/Makefile.am          |    2 +-
 plug-ins/file-faxg3/Makefile.am        |    2 +-
 plug-ins/file-fits/Makefile.am         |    2 +-
 plug-ins/file-fli/Makefile.am          |    2 +-
 plug-ins/file-ico/Makefile.am          |    2 +-
 plug-ins/file-jpeg/Makefile.am         |    2 +-
 plug-ins/file-psd/Makefile.am          |    2 +-
 plug-ins/file-sgi/Makefile.am          |    2 +-
 plug-ins/file-uri/Makefile.am          |    2 +-
 plug-ins/flame/Makefile.am             |    2 +-
 plug-ins/fractal-explorer/Makefile.am  |    2 +-
 plug-ins/gfig/Makefile.am              |    2 +-
 plug-ins/gimpressionist/Makefile.am    |   11 +++----
 plug-ins/gradient-flare/Makefile.am    |    2 +-
 plug-ins/help-browser/Makefile.am      |    2 +-
 plug-ins/help/Makefile.am              |   17 +++++------
 plug-ins/ifs-compose/Makefile.am       |    2 +-
 plug-ins/imagemap/Makefile.am          |    2 +-
 plug-ins/lighting/Makefile.am          |    2 +-
 plug-ins/map-object/Makefile.am        |    2 +-
 plug-ins/maze/Makefile.am              |    2 +-
 plug-ins/metadata/Makefile.am          |    2 +-
 plug-ins/pagecurl/Makefile.am          |    2 +-
 plug-ins/print/Makefile.am             |    2 +-
 plug-ins/pygimp/Makefile.am            |    7 ++++-
 plug-ins/script-fu/Makefile.am         |    2 +-
 plug-ins/selection-to-path/Makefile.am |    2 +-
 plug-ins/twain/Makefile.am             |    4 +-
 plug-ins/win-snap/Makefile.am          |    2 +-
 tools/Makefile.am                      |   46 +++++++++++++++----------------
 64 files changed, 261 insertions(+), 314 deletions(-)
---
diff --git a/app/Makefile.am b/app/Makefile.am
index 59d14e0..e559433 100644
--- a/app/Makefile.am
+++ b/app/Makefile.am
@@ -107,14 +107,12 @@ endif
 
 AM_CPPFLAGS = \
        -DG_LOG_DOMAIN=\"Gimp\"         \
-       -DGIMP_APP_GLUE_COMPILATION
-
-INCLUDES = \
-       -I$(top_srcdir)         \
-       $(GTK_CFLAGS)           \
-       $(PANGOCAIRO_CFLAGS)    \
-       $(GEGL_CFLAGS)          \
-       -I$(includedir)         \
+       -DGIMP_APP_GLUE_COMPILATION     \
+       -I$(top_srcdir)                 \
+       $(GTK_CFLAGS)                   \
+       $(PANGOCAIRO_CFLAGS)            \
+       $(GEGL_CFLAGS)                  \
+       -I$(includedir)                 \
        -I$(builddir)/gui
 
 # FIXME: core should not depend on xcf
diff --git a/app/actions/Makefile.am b/app/actions/Makefile.am
index cd6dcf7..496a1d9 100644
--- a/app/actions/Makefile.am
+++ b/app/actions/Makefile.am
@@ -1,15 +1,13 @@
 ## Process this file with automake to produce Makefile.in
 
 AM_CPPFLAGS = \
-       -DG_LOG_DOMAIN=\"Gimp-Actions\"
-
-INCLUDES = \
-       -I$(top_builddir)       \
-       -I$(top_srcdir)         \
-       -I$(top_builddir)/app   \
-       -I$(top_srcdir)/app     \
-       $(GEGL_CFLAGS)          \
-       $(GTK_CFLAGS)           \
+       -DG_LOG_DOMAIN=\"Gimp-Actions\" \
+       -I$(top_builddir)               \
+       -I$(top_srcdir)                 \
+       -I$(top_builddir)/app           \
+       -I$(top_srcdir)/app             \
+       $(GEGL_CFLAGS)                  \
+       $(GTK_CFLAGS)                   \
        -I$(includedir)
 
 noinst_LIBRARIES = libappactions.a
diff --git a/app/config/Makefile.am b/app/config/Makefile.am
index 7e70949..a16887a 100644
--- a/app/config/Makefile.am
+++ b/app/config/Makefile.am
@@ -8,17 +8,15 @@ libgimpmodule = $(top_builddir)/libgimpmodule/libgimpmodule-$(GIMP_API_VERSION).
 libgimpthumb = $(top_builddir)/libgimpthumb/libgimpthumb-$(GIMP_API_VERSION).la
 
 AM_CPPFLAGS = \
-       -DG_LOG_DOMAIN=\"Gimp-Config\"  \
-       -DGIMP_APP_VERSION_STRING=\"$(GIMP_APP_VERSION)\"
-
-INCLUDES = \
-       -I$(top_builddir)       \
-       -I$(top_srcdir)         \
-       -I$(top_builddir)/app   \
-       -I$(top_srcdir)/app     \
-       $(GEGL_CFLAGS)          \
-       $(CAIRO_CFLAGS)         \
-       $(GDK_PIXBUF_CFLAGS)    \
+       -DG_LOG_DOMAIN=\"Gimp-Config\"                          \
+       -DGIMP_APP_VERSION_STRING=\"$(GIMP_APP_VERSION)\"       \
+       -I$(top_builddir)                                       \
+       -I$(top_srcdir)                                         \
+       -I$(top_builddir)/app                                   \
+       -I$(top_srcdir)/app                                     \
+       $(GEGL_CFLAGS)                                          \
+       $(CAIRO_CFLAGS)                                         \
+       $(GDK_PIXBUF_CFLAGS)                                    \
        -I$(includedir)
 
 noinst_LIBRARIES = libappconfig.a
diff --git a/app/core/Makefile.am b/app/core/Makefile.am
index ed543e2..df5435b 100644
--- a/app/core/Makefile.am
+++ b/app/core/Makefile.am
@@ -2,16 +2,14 @@
 
 AM_CPPFLAGS = \
        -DGIMP_APP_VERSION=\"$(GIMP_APP_VERSION)\"      \
-       -DG_LOG_DOMAIN=\"Gimp-Core\"
-
-INCLUDES = \
-       -I$(top_builddir)       \
-       -I$(top_srcdir)         \
-       -I$(top_builddir)/app   \
-       -I$(top_srcdir)/app     \
-       $(CAIRO_CFLAGS)         \
-       $(GEGL_CFLAGS)          \
-       $(GDK_PIXBUF_CFLAGS)    \
+       -DG_LOG_DOMAIN=\"Gimp-Core\"                    \
+       -I$(top_builddir)                               \
+       -I$(top_srcdir)                                 \
+       -I$(top_builddir)/app                           \
+       -I$(top_srcdir)/app                             \
+       $(CAIRO_CFLAGS)                                 \
+       $(GEGL_CFLAGS)                                  \
+       $(GDK_PIXBUF_CFLAGS)                            \
        -I$(includedir)
 
 noinst_LIBRARIES = libappcore.a
diff --git a/app/dialogs/Makefile.am b/app/dialogs/Makefile.am
index 45e7d4a..63fdb64 100644
--- a/app/dialogs/Makefile.am
+++ b/app/dialogs/Makefile.am
@@ -1,15 +1,13 @@
 ## Process this file with automake to produce Makefile.in
 
 AM_CPPFLAGS = \
-       -DG_LOG_DOMAIN=\"Gimp-Dialogs\"
-
-INCLUDES = \
-       -I$(top_builddir)       \
-       -I$(top_srcdir)         \
-       -I$(top_builddir)/app   \
-       -I$(top_srcdir)/app     \
-       $(GEGL_CFLAGS)          \
-       $(GTK_CFLAGS)           \
+       -DG_LOG_DOMAIN=\"Gimp-Dialogs\" \
+       -I$(top_builddir)               \
+       -I$(top_srcdir)                 \
+       -I$(top_builddir)/app           \
+       -I$(top_srcdir)/app             \
+       $(GEGL_CFLAGS)                  \
+       $(GTK_CFLAGS)                   \
        -I$(includedir)
 
 noinst_LIBRARIES = libappdialogs.a
diff --git a/app/display/Makefile.am b/app/display/Makefile.am
index 336ccf3..c59f520 100644
--- a/app/display/Makefile.am
+++ b/app/display/Makefile.am
@@ -1,15 +1,13 @@
 ## Process this file with automake to produce Makefile.in
 
 AM_CPPFLAGS = \
-       -DG_LOG_DOMAIN=\"Gimp-Display\"
-
-INCLUDES = \
-       -I$(top_builddir)       \
-       -I$(top_srcdir)         \
-       -I$(top_builddir)/app   \
-       -I$(top_srcdir)/app     \
-       $(GEGL_CFLAGS)          \
-       $(GTK_CFLAGS)           \
+       -DG_LOG_DOMAIN=\"Gimp-Display\" \
+       -I$(top_builddir)               \
+       -I$(top_srcdir)                 \
+       -I$(top_builddir)/app           \
+       -I$(top_srcdir)/app             \
+       $(GEGL_CFLAGS)                  \
+       $(GTK_CFLAGS)                   \
        -I$(includedir)
 
 noinst_LIBRARIES = libappdisplay.a
diff --git a/app/file/Makefile.am b/app/file/Makefile.am
index 2f34fe9..19db33b 100644
--- a/app/file/Makefile.am
+++ b/app/file/Makefile.am
@@ -1,15 +1,13 @@
 ## Process this file with automake to produce Makefile.in
 
 AM_CPPFLAGS = \
-       -DG_LOG_DOMAIN=\"Gimp-File\"
-
-INCLUDES = \
-       -I$(top_builddir)       \
-       -I$(top_srcdir)         \
-       -I$(top_builddir)/app   \
-       -I$(top_srcdir)/app     \
-       $(GEGL_CFLAGS)          \
-       $(GDK_PIXBUF_CFLAGS)    \
+       -DG_LOG_DOMAIN=\"Gimp-File\"    \
+       -I$(top_builddir)               \
+       -I$(top_srcdir)                 \
+       -I$(top_builddir)/app           \
+       -I$(top_srcdir)/app             \
+       $(GEGL_CFLAGS)                  \
+       $(GDK_PIXBUF_CFLAGS)            \
        -I$(includedir)
 
 noinst_LIBRARIES = libappfile.a
diff --git a/app/gegl/Makefile.am b/app/gegl/Makefile.am
index 6e9238b..01e353d 100644
--- a/app/gegl/Makefile.am
+++ b/app/gegl/Makefile.am
@@ -1,16 +1,14 @@
 ## Process this file with automake to produce Makefile.in
 
 AM_CPPFLAGS = \
-       -DG_LOG_DOMAIN=\"Gimp-GEGL\"
-
-INCLUDES = \
-       -I$(top_builddir)       \
-       -I$(top_srcdir)         \
-       -I$(top_builddir)/app   \
-       -I$(top_srcdir)/app     \
-       $(CAIRO_CFLAGS)         \
-       $(GEGL_CFLAGS)          \
-       $(GDK_PIXBUF_CFLAGS)    \
+       -DG_LOG_DOMAIN=\"Gimp-GEGL\"    \
+       -I$(top_builddir)               \
+       -I$(top_srcdir)                 \
+       -I$(top_builddir)/app           \
+       -I$(top_srcdir)/app             \
+       $(CAIRO_CFLAGS)                 \
+       $(GEGL_CFLAGS)                  \
+       $(GDK_PIXBUF_CFLAGS)            \
        -I$(includedir)
 
 noinst_LIBRARIES = libappgegl.a
diff --git a/app/gui/Makefile.am b/app/gui/Makefile.am
index fe75010..b5ea072 100644
--- a/app/gui/Makefile.am
+++ b/app/gui/Makefile.am
@@ -1,18 +1,16 @@
 ## Process this file with automake to produce Makefile.in
 
 AM_CPPFLAGS = \
-       -DG_LOG_DOMAIN=\"Gimp-GUI\"     \
-       -DGIMP_COMMAND=\"@GIMP_COMMAND \"
-
-INCLUDES = \
-       -I$(top_builddir)       \
-       -I$(top_srcdir)         \
-       -I$(top_builddir)/app   \
-       -I$(top_srcdir)/app     \
-       $(GIO_UNIX_CFLAGS)      \
-       $(GEGL_CFLAGS)          \
-       $(GTK_CFLAGS)           \
-       $(DBUS_GLIB_CFLAGS)     \
+       -DG_LOG_DOMAIN=\"Gimp-GUI\"             \
+       -DGIMP_COMMAND=\"@GIMP_COMMAND \"       \
+       -I$(top_builddir)                       \
+       -I$(top_srcdir)                         \
+       -I$(top_builddir)/app                   \
+       -I$(top_srcdir)/app                     \
+       $(GIO_UNIX_CFLAGS)                      \
+       $(GEGL_CFLAGS)                          \
+       $(GTK_CFLAGS)                           \
+       $(DBUS_GLIB_CFLAGS)                     \
        -I$(includedir)
 
 noinst_LIBRARIES = libappgui.a
diff --git a/app/menus/Makefile.am b/app/menus/Makefile.am
index b6865f2..96b3b49 100644
--- a/app/menus/Makefile.am
+++ b/app/menus/Makefile.am
@@ -1,15 +1,13 @@
 ## Process this file with automake to produce Makefile.in
 
 AM_CPPFLAGS = \
-       -DG_LOG_DOMAIN=\"Gimp-Menus\"
-
-INCLUDES = \
-       -I$(top_builddir)       \
-       -I$(top_srcdir)         \
-       -I$(top_builddir)/app   \
-       -I$(top_srcdir)/app     \
-       $(GEGL_CFLAGS)          \
-       $(GTK_CFLAGS)           \
+       -DG_LOG_DOMAIN=\"Gimp-Menus\"   \
+       -I$(top_builddir)               \
+       -I$(top_srcdir)                 \
+       -I$(top_builddir)/app           \
+       -I$(top_srcdir)/app             \
+       $(GEGL_CFLAGS)                  \
+       $(GTK_CFLAGS)                   \
        -I$(includedir)
 
 noinst_LIBRARIES = libappmenus.a
diff --git a/app/operations/Makefile.am b/app/operations/Makefile.am
index 86cfd8a..2f68d3b 100644
--- a/app/operations/Makefile.am
+++ b/app/operations/Makefile.am
@@ -2,16 +2,14 @@
 SUBDIRS = tests
 
 AM_CPPFLAGS = \
-       -DG_LOG_DOMAIN=\"Gimp-Operations\"
-
-INCLUDES = \
-       -I$(top_builddir)       \
-       -I$(top_srcdir)         \
-       -I$(top_builddir)/app   \
-       -I$(top_srcdir)/app     \
-       $(CAIRO_CFLAGS)         \
-       $(GEGL_CFLAGS)          \
-       $(GDK_PIXBUF_CFLAGS)    \
+       -DG_LOG_DOMAIN=\"Gimp-Operations\"      \
+       -I$(top_builddir)                       \
+       -I$(top_srcdir)                         \
+       -I$(top_builddir)/app                   \
+       -I$(top_srcdir)/app                     \
+       $(CAIRO_CFLAGS)                         \
+       $(GEGL_CFLAGS)                          \
+       $(GDK_PIXBUF_CFLAGS)                    \
        -I$(includedir)
 
 noinst_LIBRARIES = libappoperations.a
diff --git a/app/paint/Makefile.am b/app/paint/Makefile.am
index c2c72e2..efc4639 100644
--- a/app/paint/Makefile.am
+++ b/app/paint/Makefile.am
@@ -1,16 +1,14 @@
 ## Process this file with automake to produce Makefile.in
 
 AM_CPPFLAGS = \
-       -DG_LOG_DOMAIN=\"Gimp-Paint\"
-
-INCLUDES = \
-       -I$(top_builddir)       \
-       -I$(top_srcdir)         \
-       -I$(top_builddir)/app   \
-       -I$(top_srcdir)/app     \
-       $(CAIRO_CFLAGS)         \
-       $(GEGL_CFLAGS)          \
-       $(GDK_PIXBUF_CFLAGS)    \
+       -DG_LOG_DOMAIN=\"Gimp-Paint\"   \
+       -I$(top_builddir)               \
+       -I$(top_srcdir)                 \
+       -I$(top_builddir)/app           \
+       -I$(top_srcdir)/app             \
+       $(CAIRO_CFLAGS)                 \
+       $(GEGL_CFLAGS)                  \
+       $(GDK_PIXBUF_CFLAGS)            \
        -I$(includedir)
 
 noinst_LIBRARIES = libapppaint.a
diff --git a/app/pdb/Makefile.am b/app/pdb/Makefile.am
index 74e6351..fffe894 100644
--- a/app/pdb/Makefile.am
+++ b/app/pdb/Makefile.am
@@ -1,16 +1,14 @@
 ## Process this file with automake to produce Makefile.in
 
 AM_CPPFLAGS = \
-       -DG_LOG_DOMAIN=\"Gimp-PDB\"
-
-INCLUDES = \
-       -I$(top_builddir)       \
-       -I$(top_srcdir)         \
-       -I$(top_builddir)/app   \
-       -I$(top_srcdir)/app     \
-       $(CAIRO_CFLAGS)         \
-       $(GEGL_CFLAGS)          \
-       $(GDK_PIXBUF_CFLAGS)    \
+       -DG_LOG_DOMAIN=\"Gimp-PDB\"     \
+       -I$(top_builddir)               \
+       -I$(top_srcdir)                 \
+       -I$(top_builddir)/app           \
+       -I$(top_srcdir)/app             \
+       $(CAIRO_CFLAGS)                 \
+       $(GEGL_CFLAGS)                  \
+       $(GDK_PIXBUF_CFLAGS)            \
        -I$(includedir)
 
 noinst_LIBRARIES = libapppdb.a libappinternal-procs.a
diff --git a/app/plug-in/Makefile.am b/app/plug-in/Makefile.am
index bd9053e..d757efd 100644
--- a/app/plug-in/Makefile.am
+++ b/app/plug-in/Makefile.am
@@ -1,16 +1,14 @@
 ## Process this file with automake to produce Makefile.in
 
 AM_CPPFLAGS = \
-       -DG_LOG_DOMAIN=\"Gimp-Plug-In\"
-
-INCLUDES = \
-       -I$(top_builddir)       \
-       -I$(top_srcdir)         \
-       -I$(top_builddir)/app   \
-       -I$(top_srcdir)/app     \
-       $(CAIRO_CFLAGS)         \
-       $(GEGL_CFLAGS)          \
-       $(GDK_PIXBUF_CFLAGS)    \
+       -DG_LOG_DOMAIN=\"Gimp-Plug-In\" \
+       -I$(top_builddir)               \
+       -I$(top_srcdir)                 \
+       -I$(top_builddir)/app           \
+       -I$(top_srcdir)/app             \
+       $(CAIRO_CFLAGS)                 \
+       $(GEGL_CFLAGS)                  \
+       $(GDK_PIXBUF_CFLAGS)            \
        -I$(includedir)
 
 noinst_LIBRARIES = libappplug-in.a
diff --git a/app/text/Makefile.am b/app/text/Makefile.am
index 779abf6..23de44b 100644
--- a/app/text/Makefile.am
+++ b/app/text/Makefile.am
@@ -1,16 +1,14 @@
 ## Process this file with automake to produce Makefile.in
 
 AM_CPPFLAGS = \
-       -DG_LOG_DOMAIN=\"Gimp-Text\"
-
-INCLUDES = \
-       -I$(top_builddir)       \
-       -I$(top_srcdir)         \
-       -I$(top_builddir)/app   \
-       -I$(top_srcdir)/app     \
-       $(GEGL_CFLAGS)          \
-       $(PANGOCAIRO_CFLAGS)    \
-       $(GDK_PIXBUF_CFLAGS)    \
+       -DG_LOG_DOMAIN=\"Gimp-Text\"    \
+       -I$(top_builddir)               \
+       -I$(top_srcdir)                 \
+       -I$(top_builddir)/app           \
+       -I$(top_srcdir)/app             \
+       $(GEGL_CFLAGS)                  \
+       $(PANGOCAIRO_CFLAGS)            \
+       $(GDK_PIXBUF_CFLAGS)            \
        -I$(includedir)
 
 noinst_LIBRARIES = libapptext.a
diff --git a/app/tools/Makefile.am b/app/tools/Makefile.am
index 4c0b624..50ec6b8 100644
--- a/app/tools/Makefile.am
+++ b/app/tools/Makefile.am
@@ -1,15 +1,13 @@
 ## Process this file with automake to produce Makefile.in
 
 AM_CPPFLAGS = \
-       -DG_LOG_DOMAIN=\"Gimp-Tools\"
-
-INCLUDES = \
-       -I$(top_builddir)       \
-       -I$(top_srcdir)         \
-       -I$(top_builddir)/app   \
-       -I$(top_srcdir)/app     \
-       $(GEGL_CFLAGS)          \
-       $(GTK_CFLAGS)           \
+       -DG_LOG_DOMAIN=\"Gimp-Tools\"   \
+       -I$(top_builddir)               \
+       -I$(top_srcdir)                 \
+       -I$(top_builddir)/app           \
+       -I$(top_srcdir)/app             \
+       $(GEGL_CFLAGS)                  \
+       $(GTK_CFLAGS)                   \
        -I$(includedir)
 
 noinst_LIBRARIES = libapptools.a
diff --git a/app/vectors/Makefile.am b/app/vectors/Makefile.am
index 86e3747..aa6e10d 100644
--- a/app/vectors/Makefile.am
+++ b/app/vectors/Makefile.am
@@ -1,16 +1,14 @@
 ## Process this file with automake to produce Makefile.in
 
 AM_CPPFLAGS = \
-       -DG_LOG_DOMAIN=\"Gimp-Vectors\"
-
-INCLUDES = \
-       -I$(top_builddir)       \
-       -I$(top_srcdir)         \
-       -I$(top_builddir)/app   \
-       -I$(top_srcdir)/app     \
-       $(CAIRO_CFLAGS)         \
-       $(GEGL_CFLAGS)          \
-       $(GDK_PIXBUF_CFLAGS)    \
+       -DG_LOG_DOMAIN=\"Gimp-Vectors\" \
+       -I$(top_builddir)               \
+       -I$(top_srcdir)                 \
+       -I$(top_builddir)/app           \
+       -I$(top_srcdir)/app             \
+       $(CAIRO_CFLAGS)                 \
+       $(GEGL_CFLAGS)                  \
+       $(GDK_PIXBUF_CFLAGS)            \
        -I$(includedir)
 
 noinst_LIBRARIES = libappvectors.a
diff --git a/app/widgets/Makefile.am b/app/widgets/Makefile.am
index c0485b6..6369e7d 100644
--- a/app/widgets/Makefile.am
+++ b/app/widgets/Makefile.am
@@ -3,15 +3,13 @@
 AM_CPPFLAGS = \
         -DISO_CODES_LOCATION=\"$(ISO_CODES_LOCATION)\"         \
         -DISO_CODES_LOCALEDIR=\"$(ISO_CODES_LOCALEDIR)\"       \
-       -DG_LOG_DOMAIN=\"Gimp-Widgets\"
-
-INCLUDES = \
-       -I$(top_builddir)       \
-       -I$(top_srcdir)         \
-       -I$(top_builddir)/app   \
-       -I$(top_srcdir)/app     \
-       $(GEGL_CFLAGS)          \
-       $(GTK_CFLAGS)           \
+       -DG_LOG_DOMAIN=\"Gimp-Widgets\"                         \
+       -I$(top_builddir)                                       \
+       -I$(top_srcdir)                                         \
+       -I$(top_builddir)/app                                   \
+       -I$(top_srcdir)/app                                     \
+       $(GEGL_CFLAGS)                                          \
+       $(GTK_CFLAGS)                                           \
        -I$(includedir)
 
 noinst_LIBRARIES = libappwidgets.a
diff --git a/app/xcf/Makefile.am b/app/xcf/Makefile.am
index 32f1cb4..65a3dc8 100644
--- a/app/xcf/Makefile.am
+++ b/app/xcf/Makefile.am
@@ -1,16 +1,14 @@
 ## Process this file with automake to produce Makefile.in
 
 AM_CPPFLAGS = \
-       -DG_LOG_DOMAIN=\"Gimp-XCF\"
-
-INCLUDES = \
-       -I$(top_builddir)       \
-       -I$(top_srcdir)         \
-       -I$(top_builddir)/app   \
-       -I$(top_srcdir)/app     \
-       $(CAIRO_CFLAGS)         \
-       $(GEGL_CFLAGS)          \
-       $(GDK_PIXBUF_CFLAGS)    \
+       -DG_LOG_DOMAIN=\"Gimp-XCF\"     \
+       -I$(top_builddir)               \
+       -I$(top_srcdir)                 \
+       -I$(top_builddir)/app           \
+       -I$(top_srcdir)/app             \
+       $(CAIRO_CFLAGS)                 \
+       $(GEGL_CFLAGS)                  \
+       $(GDK_PIXBUF_CFLAGS)            \
        -I$(includedir)
 
 noinst_LIBRARIES = libappxcf.a
diff --git a/devel-docs/tools/Makefile.am b/devel-docs/tools/Makefile.am
index 60246b8..4554852 100644
--- a/devel-docs/tools/Makefile.am
+++ b/devel-docs/tools/Makefile.am
@@ -14,10 +14,10 @@ libgimpmodule = $(top_builddir)/libgimpmodule/libgimpmodule-$(GIMP_API_VERSION).
 libgimpwidgets = $(top_builddir)/libgimpwidgets/libgimpwidgets-$(GIMP_API_VERSION).la
 
 
-AM_CPPFLAGS = $(GTK_CFLAGS) -DTOP_SRCDIR=\"$(top_srcdir)\"
-
-INCLUDES = \
-       -I$(top_srcdir) \
+AM_CPPFLAGS = \
+       $(GTK_CFLAGS)                   \
+        -DTOP_SRCDIR=\"$(top_srcdir)\" \
+       -I$(top_srcdir)                 \
        $(GEGL_CFLAGS)
 
 AM_LDFLAGS = $(mwindows)
diff --git a/libgimp/Makefile.am b/libgimp/Makefile.am
index 94ff4c9..775ed14 100644
--- a/libgimp/Makefile.am
+++ b/libgimp/Makefile.am
@@ -64,13 +64,11 @@ gimpincludedir = $(includedir)/gimp-$(GIMP_API_VERSION)/libgimp
 
 AM_CPPFLAGS = \
        -DG_LOG_DOMAIN=\"LibGimp\"      \
-       -DGIMP_COMPILATION
-
-INCLUDES = \
-       -I$(top_srcdir) \
-       $(GTK_CFLAGS)   \
-       $(GEGL_CFLAGS)  \
-       -I$(includedir) \
+       -DGIMP_COMPILATION              \
+       -I$(top_srcdir)                 \
+       $(GTK_CFLAGS)                   \
+       $(GEGL_CFLAGS)                  \
+       -I$(includedir)                 \
        $(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 cc8c930..40e860c 100644
--- a/libgimpbase/Makefile.am
+++ b/libgimpbase/Makefile.am
@@ -58,19 +58,17 @@ AM_CPPFLAGS = \
        -DGIMP_SYSCONF_VERSION=\"$(GIMP_SYSCONF_VERSION)\"      \
        -DGIMP_PLUGIN_VERSION=\"$(GIMP_PLUGIN_VERSION)\"        \
        -DG_LOG_DOMAIN=\"LibGimpBase\"                          \
-       -DGIMP_BASE_COMPILATION
+       -DGIMP_BASE_COMPILATION                                 \
+       -I$(top_srcdir)                                         \
+       $(GLIB_CFLAGS)                                          \
+       $(BINRELOC_CFLAGS)                                      \
+       -I$(includedir)                                         \
+       $(xobjective_c)
 
 AM_CCASFLAGS = \
        -I$(top_builddir)       \
        -I$(top_srcdir)
 
-INCLUDES = \
-       -I$(top_srcdir)         \
-       $(GLIB_CFLAGS)          \
-       $(BINRELOC_CFLAGS)      \
-       -I$(includedir)         \
-       $(xobjective_c)
-
 EXTRA_DIST = \
        gimpbase.def
 
diff --git a/libgimpcolor/Makefile.am b/libgimpcolor/Makefile.am
index 20f43fa..c2fd45f 100644
--- a/libgimpcolor/Makefile.am
+++ b/libgimpcolor/Makefile.am
@@ -48,13 +48,11 @@ libgimpcolorincludedir = $(includedir)/gimp-$(GIMP_API_VERSION)/libgimpcolor
 
 AM_CPPFLAGS = \
        -DG_LOG_DOMAIN=\"LibGimpColor\" \
-       -DGIMP_COLOR_COMPILATION
-
-INCLUDES = \
-       -I$(top_srcdir)         \
-       $(GEGL_CFLAGS)          \
-       $(CAIRO_CFLAGS)         \
-       $(GDK_PIXBUF_CFLAGS)    \
+       -DGIMP_COLOR_COMPILATION        \
+       -I$(top_srcdir)                 \
+       $(GEGL_CFLAGS)                  \
+       $(CAIRO_CFLAGS)                 \
+       $(GDK_PIXBUF_CFLAGS)            \
        -I$(includedir)
 
 EXTRA_DIST = \
diff --git a/libgimpconfig/Makefile.am b/libgimpconfig/Makefile.am
index 2c6d46b..8267c7e 100644
--- a/libgimpconfig/Makefile.am
+++ b/libgimpconfig/Makefile.am
@@ -45,13 +45,11 @@ libgimpconfigincludedir = $(includedir)/gimp-$(GIMP_API_VERSION)/libgimpconfig
 
 AM_CPPFLAGS = \
        -DG_LOG_DOMAIN=\"LibGimpConfig\"        \
-       -DGIMP_CONFIG_COMPILATION
-
-INCLUDES = \
-       -I$(top_srcdir)         \
-       $(GEGL_CFLAGS)          \
-       $(CAIRO_CFLAGS)         \
-       $(GDK_PIXBUF_CFLAGS)    \
+       -DGIMP_CONFIG_COMPILATION               \
+       -I$(top_srcdir)                         \
+       $(GEGL_CFLAGS)                          \
+       $(CAIRO_CFLAGS)                         \
+       $(GDK_PIXBUF_CFLAGS)                    \
        -I$(includedir)
 
 EXTRA_DIST = \
diff --git a/libgimpmath/Makefile.am b/libgimpmath/Makefile.am
index 57d5020..b2c8394 100644
--- a/libgimpmath/Makefile.am
+++ b/libgimpmath/Makefile.am
@@ -48,11 +48,9 @@ libgimpmathincludedir = $(includedir)/gimp-$(GIMP_API_VERSION)/libgimpmath
 
 AM_CPPFLAGS = \
        -DG_LOG_DOMAIN=\"LibGimpMath\"  \
-       -DGIMP_MATH_COMPILATION
-
-INCLUDES = \
-       -I$(top_srcdir) \
-       $(GLIB_CFLAGS)  \
+       -DGIMP_MATH_COMPILATION         \
+       -I$(top_srcdir)                 \
+       $(GLIB_CFLAGS)                  \
        -I$(includedir)
 
 EXTRA_DIST = \
diff --git a/libgimpmodule/Makefile.am b/libgimpmodule/Makefile.am
index 4379a62..9b4d4d9 100644
--- a/libgimpmodule/Makefile.am
+++ b/libgimpmodule/Makefile.am
@@ -43,12 +43,10 @@ libgimpmoduleincludedir = $(includedir)/gimp-$(GIMP_API_VERSION)/libgimpmodule
 
 AM_CPPFLAGS = \
        -DG_LOG_DOMAIN=\"LibGimpModule\"        \
-       -DGIMP_MODULE_COMPILATION
-
-INCLUDES = \
-       -I$(top_srcdir)                 \
-       $(GLIB_CFLAGS)                  \
-       $(GMODULE_NO_EXPORT_CFLAGS)     \
+       -DGIMP_MODULE_COMPILATION               \
+       -I$(top_srcdir)                         \
+       $(GLIB_CFLAGS)                          \
+       $(GMODULE_NO_EXPORT_CFLAGS)             \
        -I$(includedir)
 
 EXTRA_DIST = \
diff --git a/libgimpthumb/Makefile.am b/libgimpthumb/Makefile.am
index 081894b..3130592 100644
--- a/libgimpthumb/Makefile.am
+++ b/libgimpthumb/Makefile.am
@@ -46,13 +46,11 @@ libgimpthumbincludedir = $(includedir)/gimp-$(GIMP_API_VERSION)/libgimpthumb
 
 AM_CPPFLAGS = \
        -DG_LOG_DOMAIN=\"LibGimpThumb\" \
-       -DGIMP_THUMB_COMPILATION
-
-INCLUDES = \
-       -I$(top_srcdir)         \
-       $(GDK_PIXBUF_CFLAGS)    \
-       $(GLIB_CFLAGS)          \
-       -I$(includedir)         \
+       -DGIMP_THUMB_COMPILATION        \
+       -I$(top_srcdir)                 \
+       $(GDK_PIXBUF_CFLAGS)            \
+       $(GLIB_CFLAGS)                  \
+       -I$(includedir)                 \
        $(xobjective_c)
 
 EXTRA_DIST = \
diff --git a/libgimpwidgets/Makefile.am b/libgimpwidgets/Makefile.am
index 98fe0d6..5075155 100644
--- a/libgimpwidgets/Makefile.am
+++ b/libgimpwidgets/Makefile.am
@@ -50,12 +50,10 @@ libgimpwidgetsincludedir = $(includedir)/gimp-$(GIMP_API_VERSION)/libgimpwidgets
 
 AM_CPPFLAGS = \
        -DG_LOG_DOMAIN=\"LibGimpWidgets\"       \
-       -DGIMP_WIDGETS_COMPILATION
-
-INCLUDES = \
-       -I$(top_srcdir) \
-       $(GEGL_CFLAGS)  \
-       $(GTK_CFLAGS)   \
+       -DGIMP_WIDGETS_COMPILATION              \
+       -I$(top_srcdir)                         \
+       $(GEGL_CFLAGS)                          \
+       $(GTK_CFLAGS)                           \
        -I$(includedir)
 
 lib_LTLIBRARIES = libgimpwidgets- GIMP_API_VERSION@.la
diff --git a/modules/Makefile.am b/modules/Makefile.am
index b81659e..7e8110f 100644
--- a/modules/Makefile.am
+++ b/modules/Makefile.am
@@ -12,7 +12,7 @@ endif
 
 libdir = $(gimpplugindir)/modules
 
-INCLUDES = \
+AM_CPPFLAGS = \
         -I$(top_srcdir)        \
        $(GEGL_CFLAGS)  \
         $(GTK_CFLAGS)  \
diff --git a/plug-ins/color-rotate/Makefile.am b/plug-ins/color-rotate/Makefile.am
index 0a9912c..4751ef3 100644
--- a/plug-ins/color-rotate/Makefile.am
+++ b/plug-ins/color-rotate/Makefile.am
@@ -41,7 +41,7 @@ color_rotate_SOURCES = \
        color-rotate-stock.c            \
        color-rotate-stock.h
 
-INCLUDES = \
+AM_CPPFLAGS = \
        -I$(top_srcdir) \
        $(GTK_CFLAGS)   \
        $(GEGL_CFLAGS) \
diff --git a/plug-ins/common/Makefile.am b/plug-ins/common/Makefile.am
index ac6864b..5a2bb2b 100644
--- a/plug-ins/common/Makefile.am
+++ b/plug-ins/common/Makefile.am
@@ -37,7 +37,7 @@ EXTRA_DIST = \
        plugin-defs.pl  \
        gimprc.common
 
-INCLUDES = \
+AM_CPPFLAGS = \
        -I$(top_srcdir) \
        $(GTK_CFLAGS)   \
        $(GEGL_CFLAGS)  \
diff --git a/plug-ins/common/mkgen.pl b/plug-ins/common/mkgen.pl
index e890190..6ea30dc 100755
--- a/plug-ins/common/mkgen.pl
+++ b/plug-ins/common/mkgen.pl
@@ -88,7 +88,7 @@ EXTRA_DIST = \\
        plugin-defs.pl$extra    \\
        $rcfile
 
-INCLUDES = \\
+AM_CPPFLAGS = \\
        -I\$(top_srcdir)        \\
        \$(GTK_CFLAGS)  \\
        \$(GEGL_CFLAGS) \\
diff --git a/plug-ins/file-bmp/Makefile.am b/plug-ins/file-bmp/Makefile.am
index 5fc7138..c201490 100644
--- a/plug-ins/file-bmp/Makefile.am
+++ b/plug-ins/file-bmp/Makefile.am
@@ -29,7 +29,7 @@ file_bmp_SOURCES = \
        bmp-read.c      \
        bmp-write.c
 
-INCLUDES = \
+AM_CPPFLAGS = \
        -I$(top_srcdir) \
        $(GTK_CFLAGS)   \
        $(GEGL_CFLAGS) \
diff --git a/plug-ins/file-compressor/Makefile.am b/plug-ins/file-compressor/Makefile.am
index 710117b..bbea43d 100644
--- a/plug-ins/file-compressor/Makefile.am
+++ b/plug-ins/file-compressor/Makefile.am
@@ -19,7 +19,7 @@ libexec_PROGRAMS = file-compressor
 file_compressor_SOURCES = \
        file-compressor.c
 
-INCLUDES = \
+AM_CPPFLAGS = \
        -I$(top_srcdir) \
        $(GTK_CFLAGS)   \
        $(GEGL_CFLAGS) \
diff --git a/plug-ins/file-exr/Makefile.am b/plug-ins/file-exr/Makefile.am
index e7c4ebe..37b5f6e 100644
--- a/plug-ins/file-exr/Makefile.am
+++ b/plug-ins/file-exr/Makefile.am
@@ -21,7 +21,7 @@ AM_LDFLAGS = $(mwindows)
 
 libexecdir = $(gimpplugindir)/plug-ins
 
-INCLUDES = \
+AM_CPPFLAGS = \
        -I$(top_srcdir)   \
        $(GTK_CFLAGS)     \
        $(GEGL_CFLAGS)    \
diff --git a/plug-ins/file-faxg3/Makefile.am b/plug-ins/file-faxg3/Makefile.am
index 77b2f3e..799ffc3 100644
--- a/plug-ins/file-faxg3/Makefile.am
+++ b/plug-ins/file-faxg3/Makefile.am
@@ -28,7 +28,7 @@ file_faxg3_SOURCES = \
        g3.c            \
        g3.h
 
-INCLUDES = \
+AM_CPPFLAGS = \
        -I$(top_srcdir)         \
        $(CAIRO_CFLAGS)         \
        $(GDK_PIXBUF_CFLAGS)    \
diff --git a/plug-ins/file-fits/Makefile.am b/plug-ins/file-fits/Makefile.am
index 5ffb537..25f2b99 100644
--- a/plug-ins/file-fits/Makefile.am
+++ b/plug-ins/file-fits/Makefile.am
@@ -29,7 +29,7 @@ file_fits_SOURCES = \
        fits-io.c       \
        fits-io.h
 
-INCLUDES = \
+AM_CPPFLAGS = \
        -I$(top_srcdir) \
        $(GTK_CFLAGS)   \
        $(GEGL_CFLAGS) \
diff --git a/plug-ins/file-fli/Makefile.am b/plug-ins/file-fli/Makefile.am
index 5d69880..9fd8667 100644
--- a/plug-ins/file-fli/Makefile.am
+++ b/plug-ins/file-fli/Makefile.am
@@ -28,7 +28,7 @@ file_fli_SOURCES = \
        fli.c   \
        fli-gimp.c
 
-INCLUDES = \
+AM_CPPFLAGS = \
        -I$(top_srcdir) \
        $(GTK_CFLAGS)   \
        $(GEGL_CFLAGS) \
diff --git a/plug-ins/file-ico/Makefile.am b/plug-ins/file-ico/Makefile.am
index d57bd40..8676947 100644
--- a/plug-ins/file-ico/Makefile.am
+++ b/plug-ins/file-ico/Makefile.am
@@ -35,7 +35,7 @@ file_ico_SOURCES = \
        ico-save.c      \
        ico-save.h
 
-INCLUDES = \
+AM_CPPFLAGS = \
        -I$(top_srcdir) \
        $(GTK_CFLAGS)   \
        $(GEGL_CFLAGS) \
diff --git a/plug-ins/file-jpeg/Makefile.am b/plug-ins/file-jpeg/Makefile.am
index bba866d..5b3f2ae 100644
--- a/plug-ins/file-jpeg/Makefile.am
+++ b/plug-ins/file-jpeg/Makefile.am
@@ -21,7 +21,7 @@ AM_LDFLAGS = $(mwindows)
 
 libexecdir = $(gimpplugindir)/plug-ins
 
-INCLUDES = \
+AM_CPPFLAGS = \
        -I$(top_srcdir) \
        $(GTK_CFLAGS)   \
        $(EXIF_CFLAGS)  \
diff --git a/plug-ins/file-psd/Makefile.am b/plug-ins/file-psd/Makefile.am
index b471292..0297581 100644
--- a/plug-ins/file-psd/Makefile.am
+++ b/plug-ins/file-psd/Makefile.am
@@ -47,7 +47,7 @@ EXTRA_DIST = \
        TODO.txt                \
        new-resource-ids.txt
 
-INCLUDES = \
+AM_CPPFLAGS = \
        -I$(top_srcdir)         \
        $(GTK_CFLAGS)           \
        $(EXIF_CFLAGS)          \
diff --git a/plug-ins/file-sgi/Makefile.am b/plug-ins/file-sgi/Makefile.am
index 032a90f..77fc3a0 100644
--- a/plug-ins/file-sgi/Makefile.am
+++ b/plug-ins/file-sgi/Makefile.am
@@ -28,7 +28,7 @@ file_sgi_SOURCES = \
        sgi-lib.c       \
        sgi-lib.h
 
-INCLUDES = \
+AM_CPPFLAGS = \
        -I$(top_srcdir) \
        $(GTK_CFLAGS)   \
        $(GEGL_CFLAGS) \
diff --git a/plug-ins/file-uri/Makefile.am b/plug-ins/file-uri/Makefile.am
index 7f099d3..a260bd2 100644
--- a/plug-ins/file-uri/Makefile.am
+++ b/plug-ins/file-uri/Makefile.am
@@ -44,7 +44,7 @@ file_uri_SOURCES = \
        uri-backend.h           \
        $(backend_sources)
 
-INCLUDES = \
+AM_CPPFLAGS = \
        -I$(top_srcdir)         \
        $(backend_cflags)       \
        $(GTK_CFLAGS)           \
diff --git a/plug-ins/flame/Makefile.am b/plug-ins/flame/Makefile.am
index fc5a4ec..fa0f6a5 100644
--- a/plug-ins/flame/Makefile.am
+++ b/plug-ins/flame/Makefile.am
@@ -35,7 +35,7 @@ flame_SOURCES = \
        rect.c          \
        rect.h
 
-INCLUDES = \
+AM_CPPFLAGS = \
        -I$(top_srcdir) \
        $(GTK_CFLAGS)   \
        $(GEGL_CFLAGS) \
diff --git a/plug-ins/fractal-explorer/Makefile.am b/plug-ins/fractal-explorer/Makefile.am
index e089a9f..56e18a7 100644
--- a/plug-ins/fractal-explorer/Makefile.am
+++ b/plug-ins/fractal-explorer/Makefile.am
@@ -33,7 +33,7 @@ fractal_explorer_SOURCES = \
        fractal-explorer.c              \
        fractal-explorer.h
 
-INCLUDES = \
+AM_CPPFLAGS = \
        -I$(top_srcdir) \
        $(GTK_CFLAGS)   \
        $(GEGL_CFLAGS) \
diff --git a/plug-ins/gfig/Makefile.am b/plug-ins/gfig/Makefile.am
index 6f2b818..bc86cc1 100644
--- a/plug-ins/gfig/Makefile.am
+++ b/plug-ins/gfig/Makefile.am
@@ -64,7 +64,7 @@ gfig_SOURCES = \
 
 EXTRA_DIST = README
 
-INCLUDES = \
+AM_CPPFLAGS = \
        -I$(top_srcdir) \
        $(GTK_CFLAGS)   \
        $(GEGL_CFLAGS) \
diff --git a/plug-ins/gimpressionist/Makefile.am b/plug-ins/gimpressionist/Makefile.am
index 2708d41..653854c 100644
--- a/plug-ins/gimpressionist/Makefile.am
+++ b/plug-ins/gimpressionist/Makefile.am
@@ -22,16 +22,15 @@ gimpressionist_RC = gimpressionist.rc.o
 endif
 
 AM_CPPFLAGS = \
-       -DDEFAULTPATH=\""~/$(gimpdir)/gimpressionist:$(gimpdatadir)/gimpressionist"\"
-
-AM_LDFLAGS = $(mwindows)
-
-INCLUDES = \
+       -DDEFAULTPATH=\""~/$(gimpdir)/gimpressionist:$(gimpdatadir)/gimpressionist"\"   \
        -I$(top_srcdir) \
        $(GTK_CFLAGS)   \
-       $(GEGL_CFLAGS) \
+       $(GEGL_CFLAGS)  \
        -I$(includedir)
 
+AM_LDFLAGS = $(mwindows)
+
+
 libexecdir = $(gimpplugindir)/plug-ins
 
 libexec_PROGRAMS = gimpressionist
diff --git a/plug-ins/gradient-flare/Makefile.am b/plug-ins/gradient-flare/Makefile.am
index bec0055..40e5840 100644
--- a/plug-ins/gradient-flare/Makefile.am
+++ b/plug-ins/gradient-flare/Makefile.am
@@ -29,7 +29,7 @@ libexec_PROGRAMS = gradient-flare
 
 gradient_flare_SOURCES = gradient-flare.c
 
-INCLUDES = \
+AM_CPPFLAGS = \
        -I$(top_srcdir) \
        $(GTK_CFLAGS)   \
        $(GEGL_CFLAGS) \
diff --git a/plug-ins/help-browser/Makefile.am b/plug-ins/help-browser/Makefile.am
index f521365..2b9cdaa 100644
--- a/plug-ins/help-browser/Makefile.am
+++ b/plug-ins/help-browser/Makefile.am
@@ -25,7 +25,7 @@ libexecdir = $(gimpplugindir)/plug-ins
 
 libexec_PROGRAMS = help-browser
 
-INCLUDES = \
+AM_CPPFLAGS = \
        -I$(top_srcdir)         \
        $(WEBKIT_CFLAGS)        \
        $(GEGL_CFLAGS) \
diff --git a/plug-ins/help/Makefile.am b/plug-ins/help/Makefile.am
index e7efde6..8457c33 100644
--- a/plug-ins/help/Makefile.am
+++ b/plug-ins/help/Makefile.am
@@ -16,7 +16,14 @@ include $(top_srcdir)/build/windows/gimprc-plug-ins.rule
 help_RC = help.rc.o
 endif
 
-AM_CPPFLAGS = -DDATADIR=\""$(gimpdatadir)"\"
+AM_CPPFLAGS = \
+       -DDATADIR=\""$(gimpdatadir)"\"  \
+       -I$(top_srcdir)                 \
+       $(CAIRO_CFLAGS)                 \
+       $(GIO_CFLAGS)                   \
+       $(GEGL_CFLAGS)                  \
+       $(GDK_PIXBUF_CFLAGS)            \
+       -I$(includedir)
 
 AM_LDFLAGS = $(mwindows)
 
@@ -42,14 +49,6 @@ libexec_PROGRAMS = help
 
 help_SOURCES = help.c
 
-INCLUDES = \
-       -I$(top_srcdir)         \
-       $(CAIRO_CFLAGS)         \
-       $(GIO_CFLAGS)           \
-       $(GEGL_CFLAGS) \
-       $(GDK_PIXBUF_CFLAGS)    \
-       -I$(includedir)
-
 LDADD = \
        $(libgimphelp)          \
        $(libgimp)              \
diff --git a/plug-ins/ifs-compose/Makefile.am b/plug-ins/ifs-compose/Makefile.am
index be7dbab..f9b6681 100644
--- a/plug-ins/ifs-compose/Makefile.am
+++ b/plug-ins/ifs-compose/Makefile.am
@@ -33,7 +33,7 @@ ifs_compose_SOURCES = \
 
 EXTRA_DIST = README.ifscompose
 
-INCLUDES = \
+AM_CPPFLAGS = \
        -I$(top_srcdir) \
        $(GTK_CFLAGS)   \
        $(GEGL_CFLAGS) \
diff --git a/plug-ins/imagemap/Makefile.am b/plug-ins/imagemap/Makefile.am
index ec436c0..018a959 100644
--- a/plug-ins/imagemap/Makefile.am
+++ b/plug-ins/imagemap/Makefile.am
@@ -131,7 +131,7 @@ imagemap_SOURCES = \
        imap_taglist.c                  \
        imap_taglist.h
 
-INCLUDES = \
+AM_CPPFLAGS = \
        -I$(top_srcdir) \
        $(GTK_CFLAGS)   \
        $(GEGL_CFLAGS) \
diff --git a/plug-ins/lighting/Makefile.am b/plug-ins/lighting/Makefile.am
index 6591537..6328685 100644
--- a/plug-ins/lighting/Makefile.am
+++ b/plug-ins/lighting/Makefile.am
@@ -43,7 +43,7 @@ lighting_SOURCES = \
        lighting-ui.c           \
        lighting-ui.h
 
-INCLUDES = \
+AM_CPPFLAGS = \
        -I$(top_srcdir) \
        $(GTK_CFLAGS)   \
        $(GEGL_CFLAGS) \
diff --git a/plug-ins/map-object/Makefile.am b/plug-ins/map-object/Makefile.am
index f0c51fd..8638291 100644
--- a/plug-ins/map-object/Makefile.am
+++ b/plug-ins/map-object/Makefile.am
@@ -43,7 +43,7 @@ map_object_SOURCES = \
        map-object-ui.c         \
        map-object-ui.h
 
-INCLUDES = \
+AM_CPPFLAGS = \
        -I$(top_srcdir) \
        $(GTK_CFLAGS)   \
        $(GEGL_CFLAGS) \
diff --git a/plug-ins/maze/Makefile.am b/plug-ins/maze/Makefile.am
index fb9b7c5..b517196 100644
--- a/plug-ins/maze/Makefile.am
+++ b/plug-ins/maze/Makefile.am
@@ -33,7 +33,7 @@ maze_SOURCES = \
        maze-utils.c            \
        maze-utils.h
 
-INCLUDES = \
+AM_CPPFLAGS = \
        -I$(top_srcdir) \
        $(GTK_CFLAGS)   \
        $(GEGL_CFLAGS) \
diff --git a/plug-ins/metadata/Makefile.am b/plug-ins/metadata/Makefile.am
index 8babc5f..841d020 100644
--- a/plug-ins/metadata/Makefile.am
+++ b/plug-ins/metadata/Makefile.am
@@ -61,7 +61,7 @@ xmpdump_SOURCES = \
        xmp-parse.h     \
        xmp-parse.c     
 
-INCLUDES = \
+AM_CPPFLAGS = \
        -I$(top_srcdir) \
        $(GTK_CFLAGS)   \
        $(GEGL_CFLAGS) \
diff --git a/plug-ins/pagecurl/Makefile.am b/plug-ins/pagecurl/Makefile.am
index a203aac..5aa6d90 100644
--- a/plug-ins/pagecurl/Makefile.am
+++ b/plug-ins/pagecurl/Makefile.am
@@ -30,7 +30,7 @@ nodist_pagecurl_SOURCES = pagecurl-icons.h
 
 BUILT_SOURCES = pagecurl-icons.h
 
-INCLUDES = \
+AM_CPPFLAGS = \
        -I$(top_srcdir) \
        $(GTK_CFLAGS)   \
        $(GEGL_CFLAGS) \
diff --git a/plug-ins/print/Makefile.am b/plug-ins/print/Makefile.am
index 23b748a..b2a294f 100644
--- a/plug-ins/print/Makefile.am
+++ b/plug-ins/print/Makefile.am
@@ -19,7 +19,7 @@ endif
 
 AM_LDFLAGS = $(mwindows)
 
-INCLUDES = \
+AM_CPPFLAGS = \
        -I$(top_srcdir)         \
        $(GTK_CFLAGS)           \
        $(GEGL_CFLAGS) \
diff --git a/plug-ins/pygimp/Makefile.am b/plug-ins/pygimp/Makefile.am
index 62843b9..8974769 100644
--- a/plug-ins/pygimp/Makefile.am
+++ b/plug-ins/pygimp/Makefile.am
@@ -21,7 +21,12 @@ endif
 
 AM_CFLAGS = $(PYGIMP_EXTRA_CFLAGS)
 
-INCLUDES = -I$(top_srcdir) $(PYTHON_INCLUDES) $(PYGTK_CFLAGS) $(GTK_CFLAGS) $(GEGL_CFLAGS)
+AM_CPPFLAGS = \
+       -I$(top_srcdir)         \
+       $(PYTHON_INCLUDES)      \
+       $(PYGTK_CFLAGS)         \
+       $(GTK_CFLAGS)           \
+       $(GEGL_CFLAGS)
 
 pygimpbase = python
 
diff --git a/plug-ins/script-fu/Makefile.am b/plug-ins/script-fu/Makefile.am
index e8352e5..aacbd42 100644
--- a/plug-ins/script-fu/Makefile.am
+++ b/plug-ins/script-fu/Makefile.am
@@ -33,7 +33,7 @@ AM_CFLAGS = \
        -DUSE_INTERFACE=1       \
        -DUSE_STRLWR=0
 
-INCLUDES = \
+AM_CPPFLAGS = \
        -I$(top_srcdir) \
        $(GTK_CFLAGS)   \
        $(GEGL_CFLAGS)  \
diff --git a/plug-ins/selection-to-path/Makefile.am b/plug-ins/selection-to-path/Makefile.am
index 6785146..b788ba4 100644
--- a/plug-ins/selection-to-path/Makefile.am
+++ b/plug-ins/selection-to-path/Makefile.am
@@ -51,7 +51,7 @@ EXTRA_DIST = \
        README          \
        README.limn
 
-INCLUDES = \
+AM_CPPFLAGS = \
        -I$(top_srcdir) \
        $(GTK_CFLAGS)   \
        $(GEGL_CFLAGS) \
diff --git a/plug-ins/twain/Makefile.am b/plug-ins/twain/Makefile.am
index 7abe073..8b24508 100644
--- a/plug-ins/twain/Makefile.am
+++ b/plug-ins/twain/Makefile.am
@@ -53,10 +53,10 @@ EXTRA_DIST = \
        tw_win.c        \
        tw_mac.c
 
-INCLUDES = \
+AM_CPPFLAGS = \
        -I$(top_srcdir) \
        $(GTK_CFLAGS)   \
-       $(GEGL_CFLAGS) \
+       $(GEGL_CFLAGS)  \
        -I$(includedir)
 
 LDADD = \
diff --git a/plug-ins/win-snap/Makefile.am b/plug-ins/win-snap/Makefile.am
index 57d6e49..bd4d654 100644
--- a/plug-ins/win-snap/Makefile.am
+++ b/plug-ins/win-snap/Makefile.am
@@ -25,7 +25,7 @@ EXTRA_DIST = \
        winsnap.ico     \
        winsnap.rc
 
-INCLUDES = \
+AM_CPPFLAGS = \
        -I$(top_srcdir)         \
        $(GTK_CFLAGS)           \
        $(GEGL_CFLAGS)          \
diff --git a/tools/Makefile.am b/tools/Makefile.am
index b2e595e..7ca1d2c 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -44,30 +44,28 @@ test_clipboard_LDADD = \
        $(GTK_LIBS)
 
 AM_CPPFLAGS = \
-       -DGIMP_APP_VERSION=\"@GIMP_APP_VERSION \"       \
-       -DLOCALEDIR=\""$(gimplocaledir)"\"              \
-       -DPREFIX=\""$(prefix)"\"                        \
-       -DEXEC_PREFIX=\""$(exec_prefix)"\"              \
-       -DBINDIR=\""$(bindir)"\"                        \
-       -DSBINDIR=\""$(sbindir)"\"                      \
-       -DLIBEXECDIR=\""$(libexecdir)"\"                \
-       -DDATADIR=\""$(datadir)"\"                      \
-       -DDATAROOTDIR=\""$(datarootdir)"\"              \
-       -DSYSCONFDIR=\""$(sysconfdir)"\"                \
-       -DSHAREDSTATEDIR=\""$(sharedstatedir)"\"        \
-       -DLOCALSTATEDIR=\""$(localstatedir)"\"          \
-       -DLIBDIR=\""$(libdir)"\"                        \
-       -DINFODIR=\""$(infodir)"\"                      \
-       -DMANDIR=\""$(mandir)"\"                        \
-       -DGIMPPLUGINDIR=\""$(gimpplugindir)"\"          \
-       -DGIMPDATADIR=\""$(gimpdatadir)"\"              \
-       -DCC=\""$(CC)"\"                                \
-       -DGIMPDIR=\""$(gimpdir)"\"                      \
-       -DGIMP_PLUGIN_VERSION=\""$(GIMP_PLUGIN_VERSION)"\"
-
-INCLUDES = \
-       -I$(top_srcdir) \
-       $(GTK_CFLAGS)   \
+       -DGIMP_APP_VERSION=\"@GIMP_APP_VERSION \"               \
+       -DLOCALEDIR=\""$(gimplocaledir)"\"                      \
+       -DPREFIX=\""$(prefix)"\"                                \
+       -DEXEC_PREFIX=\""$(exec_prefix)"\"                      \
+       -DBINDIR=\""$(bindir)"\"                                \
+       -DSBINDIR=\""$(sbindir)"\"                              \
+       -DLIBEXECDIR=\""$(libexecdir)"\"                        \
+       -DDATADIR=\""$(datadir)"\"                              \
+       -DDATAROOTDIR=\""$(datarootdir)"\"                      \
+       -DSYSCONFDIR=\""$(sysconfdir)"\"                        \
+       -DSHAREDSTATEDIR=\""$(sharedstatedir)"\"                \
+       -DLOCALSTATEDIR=\""$(localstatedir)"\"                  \
+       -DLIBDIR=\""$(libdir)"\"                                \
+       -DINFODIR=\""$(infodir)"\"                              \
+       -DMANDIR=\""$(mandir)"\"                                \
+       -DGIMPPLUGINDIR=\""$(gimpplugindir)"\"                  \
+       -DGIMPDATADIR=\""$(gimpdatadir)"\"                      \
+       -DCC=\""$(CC)"\"                                        \
+       -DGIMPDIR=\""$(gimpdir)"\"                              \
+       -DGIMP_PLUGIN_VERSION=\""$(GIMP_PLUGIN_VERSION)"\"      \
+       -I$(top_srcdir)                                         \
+       $(GTK_CFLAGS)                                           \
        -I$(includedir)
 
 EXTRA_DIST = \
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]