Use AM_CPPFLAGS instead the obsolete INCLUDES

diff --git a/demos/gtk-demo/Makefile.am b/demos/gtk-demo/Makefile.am
index e4c45538dfa91a1c3b05d92ed9e7b2a336ea92aa..973307869ce28ebf53ef80ab3d7461bd626ec93b 100644 (file)
--- a/demos/gtk-demo/Makefile.am
+++ b/demos/gtk-demo/Makefile.am
@@ -46,7 +46,7 @@ demos =                                               \
        tree_store.c                            \
        ui_manager.c
 
-INCLUDES = \
+AM_CPPFLAGS = \
        -DDEMOCODEDIR="\"$(democodedir)\""      \
        -I$(top_srcdir)                         \
        -I$(top_builddir)/gdk                   \

diff --git a/demos/pixbuf-demo/Makefile.am b/demos/pixbuf-demo/Makefile.am
index ca520ce7dcb88b3e730e7260ed1e54db21ac030b..c5c5aaae266937d27e8b0f8d24e2a4faa855b4ac 100644 (file)
--- a/demos/pixbuf-demo/Makefile.am
+++ b/demos/pixbuf-demo/Makefile.am
@@ -1,7 +1,7 @@
 ## Makefile.am for gtk+/demos
 include $(top_srcdir)/Makefile.decl
 
-INCLUDES =                             \
+AM_CPPFLAGS =                          \
        -I$(top_srcdir)                 \
        -I$(top_builddir)/gdk           \
        -DGDK_DISABLE_DEPRECATED        \

diff --git a/docs/reference/gdk/Makefile.am b/docs/reference/gdk/Makefile.am
index 8f4ad9e89ff135afa2de52dbec45f7252e305af6..aab34e34028ff370723660e0b0c89c543b7508c9 100644 (file)
--- a/docs/reference/gdk/Makefile.am
+++ b/docs/reference/gdk/Makefile.am
@@ -37,7 +37,7 @@ EXTRA_HFILES=                 \
 
 # CFLAGS and LDFLAGS for compiling scan program. Only needed
 # if $(DOC_MODULE).types is non-empty.
-INCLUDES =                     \
+AM_CPPFLAGS =                  \
        -I$(top_srcdir)         \
        -I$(top_builddir)       \
        -I$(top_builddir)/gdk   \

diff --git a/docs/reference/gtk/Makefile.am b/docs/reference/gtk/Makefile.am
index 7c80efe490cef2f188f8d6a527bbf9f5db8d7f7d..153ecfc74a09f836ddd0f6d892b73680806fc4af 100644 (file)
--- a/docs/reference/gtk/Makefile.am
+++ b/docs/reference/gtk/Makefile.am
@@ -94,7 +94,7 @@ IGNORE_HFILES=                                \
 
 # CFLAGS and LDFLAGS for compiling scan program. Only needed
 # if $(DOC_MODULE).types is non-empty.
-INCLUDES = \
+AM_CPPFLAGS = \
        -I$(top_srcdir)         \
        -I$(top_builddir)       \
        -I$(top_builddir)/gdk   \

diff --git a/docs/reference/libgail-util/Makefile.am b/docs/reference/libgail-util/Makefile.am
index 8c30e2daf74b8ed81e88134ef25a8595953124ce..b26dd5ce2220e05f3cb3229a4627949950ab24ad 100644 (file)
--- a/docs/reference/libgail-util/Makefile.am
+++ b/docs/reference/libgail-util/Makefile.am
@@ -17,7 +17,7 @@ CFILE_GLOB = $(top_srcdir)/modules/other/gail/libgail-util/*.c
 
 # CFLAGS and LDFLAGS for compiling scan program. Only needed
 # if $(DOC_MODULE).types is non-empty.
-INCLUDES =                      \
+AM_CPPFLAGS =                   \
         -I$(top_srcdir)         \
         -I$(top_builddir)       \
         $(DEP_CFLAGS)

diff --git a/docs/tools/Makefile.am b/docs/tools/Makefile.am
index 03bef71df4cc8fc35bcc690bd40cc1e0312fd5a6..e3b2966bada0ee80c8779b11d5dc3e318af31cb9 100644 (file)
--- a/docs/tools/Makefile.am
+++ b/docs/tools/Makefile.am
@@ -1,6 +1,6 @@
 include $(top_srcdir)/Makefile.decl
 
-INCLUDES = \
+AM_CPPFLAGS = \
        -I$(top_srcdir)                 \
        -I$(top_builddir)/gdk           \
        -I$(top_srcdir)/gdk             \

diff --git a/examples/Makefile.am b/examples/Makefile.am
index 8ef4e6dafedb1a23f6bd6345b8481f704b919aa2..011e5a55743f25bd19000d5d096df1bc51284280 100644 (file)
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -35,7 +35,7 @@ OLD_EXAMPLES = \
                tictactoe \
                wheelbarrow
 
-INCLUDES = \
+AM_CPPFLAGS = \
        -I$(top_srcdir)                         \
        -I$(top_srcdir)/gdk                     \
        -I$(top_builddir)/gdk                   \

diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index 9f4a570b0d991f1d3d0b13c87c82a964af7c95ae..5ac401b197568bab90e56851e9afb2c1478bd16a 100644 (file)
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -32,7 +32,7 @@ EXTRA_DIST +=                         \
        gdkenumtypes.h.template \
        abicheck.sh
 
-INCLUDES =                             \
+AM_CPPFLAGS =                          \
        -DG_LOG_DOMAIN=\"Gdk\"          \
        -DGDK_COMPILATION               \
        -I$(top_srcdir)                 \
@@ -195,7 +195,7 @@ Gdk_3_0_gir_SCANNERFLAGS =  \
 Gdk_3_0_gir_INCLUDES = Gio-2.0 GdkPixbuf-2.0 Pango-1.0 cairo-1.0
 Gdk_3_0_gir_LIBS = libgdk-3.la
 Gdk_3_0_gir_FILES = $(introspection_files)
-Gdk_3_0_gir_CFLAGS = $(INCLUDES)
+Gdk_3_0_gir_CFLAGS = $(AM_CPPFLAGS)
 Gdk_3_0_gir_EXPORT_PACKAGES = gdk-3.0
 INTROSPECTION_GIRS += Gdk-3.0.gir
 
@@ -248,7 +248,7 @@ GdkX11_3_0_gir_SCANNERFLAGS =               \
 GdkX11_3_0_gir_INCLUDES = Gio-2.0 GdkPixbuf-2.0 Pango-1.0 xlib-2.0
 GdkX11_3_0_gir_LIBS = libgdk-3.la
 GdkX11_3_0_gir_FILES = $(x11_introspection_files)
-GdkX11_3_0_gir_CFLAGS = $(INCLUDES) -L$(top_builddir)/gdk
+GdkX11_3_0_gir_CFLAGS = $(AM_CPPFLAGS) -L$(top_builddir)/gdk
 GdkX11_3_0_gir_EXPORT_PACKAGES = gdk-x11-3.0
 INTROSPECTION_GIRS += GdkX11-3.0.gir
 

diff --git a/gdk/broadway/Makefile.am b/gdk/broadway/Makefile.am
index 3c58e1ee950d91345c4ba04ba109dade977490c5..423c243dfee9aaf1597ca237d9947707e15131c2 100644 (file)
--- a/gdk/broadway/Makefile.am
+++ b/gdk/broadway/Makefile.am
@@ -4,7 +4,7 @@ include $(top_srcdir)/Makefile.decl
 libgdkincludedir = $(includedir)/gtk-3.0/gdk
 libgdkbroadwayincludedir = $(includedir)/gtk-3.0/gdk/broadway
 
-INCLUDES =                     \
+AM_CPPFLAGS =                  \
        -DG_LOG_DOMAIN=\"Gdk\"  \
        -DGDK_COMPILATION       \
        -I$(top_srcdir)         \

diff --git a/gdk/quartz/Makefile.am b/gdk/quartz/Makefile.am
index 9b2135326ee3ef26b4e130f3faca0809a2f88a57..a8be38e4f8103ace15c7f8cc708a9c52c150c4f9 100644 (file)
--- a/gdk/quartz/Makefile.am
+++ b/gdk/quartz/Makefile.am
@@ -3,7 +3,7 @@ include $(top_srcdir)/Makefile.decl
 libgdkincludedir = $(includedir)/gtk-3.0/gdk
 libgdkquartzincludedir = $(includedir)/gtk-3.0/gdk/quartz
 
-INCLUDES =                             \
+AM_CPPFLAGS =                          \
        -DG_LOG_DOMAIN=\"Gdk\"          \
        -DGDK_COMPILATION               \
        -I$(top_srcdir)                 \

diff --git a/gdk/wayland/Makefile.am b/gdk/wayland/Makefile.am
index 4681dc946601d36557cc4b3faaafdc3d10027781..01695938fd135f25f82775a36d41e8d19e95f59a 100644 (file)
--- a/gdk/wayland/Makefile.am
+++ b/gdk/wayland/Makefile.am
@@ -3,7 +3,7 @@ include $(top_srcdir)/Makefile.decl
 
 libgdkincludedir = $(includedir)/gtk-3.0/gdk
 
-INCLUDES =                                     \
+AM_CPPFLAGS =                                  \
        -DG_LOG_DOMAIN=\"Gdk\"                  \
        -DGDK_COMPILATION                       \
        -I$(top_srcdir)                         \

diff --git a/gdk/win32/Makefile.am b/gdk/win32/Makefile.am
index 404ddd6aefa7a09603d72ee4c85fd6c762faddf9..9b4d3eecd567ad9e9f57058059671c5c0ee724a1 100644 (file)
--- a/gdk/win32/Makefile.am
+++ b/gdk/win32/Makefile.am
@@ -3,7 +3,7 @@ include $(top_srcdir)/Makefile.decl
 
 libgdkincludedir = $(includedir)/gtk-3.0/gdk
 
-INCLUDES = \
+AM_CPPFLAGS = \
        -DG_LOG_DOMAIN=\"Gdk\"  \
        -DINSIDE_GDK_WIN32      \
        -I$(top_srcdir)         \

diff --git a/gdk/x11/Makefile.am b/gdk/x11/Makefile.am
index 6aea001ded4a213a74554f4df4f1348bd1690d97..6e10b494c208f8d0136e3b62b1584a560bfe0a93 100644 (file)
--- a/gdk/x11/Makefile.am
+++ b/gdk/x11/Makefile.am
@@ -4,7 +4,7 @@ include $(top_srcdir)/Makefile.decl
 libgdkincludedir = $(includedir)/gtk-3.0/gdk
 libgdkx11includedir = $(includedir)/gtk-3.0/gdk/x11
 
-INCLUDES =                     \
+AM_CPPFLAGS =                  \
        -DG_LOG_DOMAIN=\"Gdk\"  \
        -DGDK_COMPILATION       \
        -I$(top_srcdir)         \

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index e532bda4052687c1b46cf8730b16a844a0b96c0e..992f9cb79485134b8ff19646b159899a08e4d400 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -32,7 +32,7 @@ endif
 endif
 endif
 
-INCLUDES =                                             \
+AM_CPPFLAGS =                                          \
        -DG_LOG_DOMAIN=\"Gtk\"                          \
        -DGTK_LIBDIR=\"$(libdir)\"                      \
        -DGTK_DATADIR=\"$(datadir)\"                    \
@@ -894,7 +894,7 @@ gtktypebuiltins.c: @REBUILD@ $(gtk_public_h_sources) gtktypebuiltins.c.template
 
 gtktypefuncs.c: @REBUILD@ stamp-gtktypebuiltins.h $(top_srcdir)/gtk/*.h $(top_srcdir)/gdk/*.h Makefile
        $(AM_V_GEN) echo '#include <gtk/gtkx.h>' > xgen-gtfsrc.c && \
-         ${CPP} $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) xgen-gtfsrc.c | \
+         ${CPP} $(DEFS) $(AM_CPPFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) xgen-gtfsrc.c | \
          $(GREP) -o '\bg[td]k_[a-zA-Z0-9_]*_get_type\b' | \
          sort | uniq | \
          $(SED) '{ s/^/*tp++ = /; s/$$/();/; s/^.*\(gdk_x11\|gtk_plug_\|gtk_socket_\).*$$/#ifdef GDK_WINDOWING_X11\n&\n#endif/; }' > xgen-gtf \
@@ -1018,7 +1018,7 @@ endif
 Gtk_3_0_gir_SCANNERFLAGS += --c-include="gtk/gtkx.h"
 Gtk_3_0_gir_INCLUDES = Atk-1.0
 Gtk_3_0_gir_CFLAGS = \
-               $(INCLUDES) \
+               $(AM_CPPFLAGS) \
                -UGDK_DISABLE_DEPRECATED \
                -UGTK_DISABLE_DEPRECATED \
                -DGTK_TEXT_USE_INTERNAL_UNSUPPORTED_API

diff --git a/gtk/tests/Makefile.am b/gtk/tests/Makefile.am
index 8b2e131b47f6b10ccd8495cc009f126c4c69e34e..528abd8f2ca22c27c14faa7a4ad3b3a6484c5525 100644 (file)
--- a/gtk/tests/Makefile.am
+++ b/gtk/tests/Makefile.am
@@ -2,7 +2,7 @@ include $(top_srcdir)/Makefile.decl
 
 SUBDIRS =
 
-INCLUDES = \
+AM_CPPFLAGS = \
        -I$(top_srcdir)                 \
        -I$(top_builddir)/gdk           \
        -I$(top_srcdir)/gdk             \

diff --git a/modules/engines/ms-windows/Makefile.am b/modules/engines/ms-windows/Makefile.am
index de4562ba7b9541f797bffcb01b3bcd866695b391..fd0a40e480e018df9dde436a4f9cc4435b8690b9 100644 (file)
--- a/modules/engines/ms-windows/Makefile.am
+++ b/modules/engines/ms-windows/Makefile.am
@@ -4,7 +4,7 @@ SUBDIRS=Theme
 
 EXTRA_DIST += Makefile.msc
 
-INCLUDES = \
+AM_CPPFLAGS = \
        -I$(top_srcdir)                 \
        -I$(top_srcdir)/gdk             \
        -I$(top_builddir)/gdk           \

diff --git a/modules/engines/pixbuf/Makefile.am b/modules/engines/pixbuf/Makefile.am
index 2a90796b74bc5aa906c51bd015ae7cdaa0a2ca13..59a280c7073031c8cdbd79eed41228e84bf368e8 100644 (file)
--- a/modules/engines/pixbuf/Makefile.am
+++ b/modules/engines/pixbuf/Makefile.am
@@ -4,7 +4,7 @@ if PLATFORM_WIN32
 no_undefined = -no-undefined
 endif
 
-INCLUDES = \
+AM_CPPFLAGS = \
        -I$(top_srcdir)                 \
        -I$(top_srcdir)/gdk             \
        -I$(top_builddir)/gdk           \

diff --git a/modules/printbackends/cups/Makefile.am b/modules/printbackends/cups/Makefile.am
index 665657a4c10bb9c24c8d16a0ad1e8d2ccc374895..f90a28f73b736b24eaf15a730266a2243d4c02da 100644 (file)
--- a/modules/printbackends/cups/Makefile.am
+++ b/modules/printbackends/cups/Makefile.am
@@ -4,7 +4,7 @@ if PLATFORM_WIN32
 no_undefined = -no-undefined
 endif
 
-INCLUDES = \
+AM_CPPFLAGS = \
        -I$(top_srcdir)                                 \
        -I$(top_srcdir)/gtk                             \
        -I$(top_builddir)/gtk                           \

diff --git a/modules/printbackends/lpr/Makefile.am b/modules/printbackends/lpr/Makefile.am
index 38236525b74d8961993bfec5d6b6d12360c62bc8..ff51351d3d9d5c872a6ccf4a37c2b7c9e475d208 100644 (file)
--- a/modules/printbackends/lpr/Makefile.am
+++ b/modules/printbackends/lpr/Makefile.am
@@ -4,7 +4,7 @@ if PLATFORM_WIN32
 no_undefined = -no-undefined
 endif
 
-INCLUDES = \
+AM_CPPFLAGS = \
        -I$(top_srcdir)                                 \
        -I$(top_srcdir)/gtk                             \
        -I$(top_builddir)/gtk                           \

diff --git a/modules/printbackends/papi/Makefile.am b/modules/printbackends/papi/Makefile.am
index 9d7109d0c3a7b4376928d21ae3047a38ad910b38..5388baa3a359389cd14a883c1aa43f814f600f4f 100644 (file)
--- a/modules/printbackends/papi/Makefile.am
+++ b/modules/printbackends/papi/Makefile.am
@@ -2,7 +2,7 @@ if OS_WIN32
 no_undefined = -no-undefined
 endif
 
-INCLUDES = \
+AM_CPPFLAGS = \
        -I$(top_srcdir)                                 \
        -I$(top_srcdir)/gtk                             \
        -I$(top_builddir)/gtk                           \

diff --git a/perf/Makefile.am b/perf/Makefile.am
index 799b748eabbcfcdbf3d09bb58642aa7cdcaa59d7..6bb0ce767f5756662b044b8427cdcb2766f9b676 100644 (file)
--- a/perf/Makefile.am
+++ b/perf/Makefile.am
@@ -1,7 +1,7 @@
 ## Makefile.am for gtk+/perf
 include $(top_srcdir)/Makefile.decl
 
-INCLUDES =                             \
+AM_CPPFLAGS =                          \
        -I$(top_srcdir)                 \
        -I$(top_builddir)/gdk           \
        -I$(top_srcdir)/gdk             \