[PATCH] build: Don't use the deprecated INCLUDES variable.

[poljar (Damir Jelić)]

From: poljar (Damir Jelić) <poljarinho at gmail.com>

This patch fixes several warnings about the INCLUDES variable:
    doc/Makefile.am:28: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS')

The INCLUDES variable was removed and replaced with it's *_CPPFLAGS
equivalent.

https://www.gnu.org/software/automake/manual/html_node/Program-Variables.html
Signed-off-by: poljar (Damir Jelić) <poljar at poljar.org>
---
 doc/Makefile.am       |  2 +-
 src/Makefile.am       |  2 +-
 src/tests/Makefile.am |  2 +-
 tools/Makefile.am     |  2 +-
 udisks/Makefile.am    | 29 +++++++++++++----------------
 5 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 24fd20c..472a06d 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -25,7 +25,7 @@ IGNORE_HFILES=				\
 
 # CFLAGS and LDFLAGS for compiling scan program. Only needed
 # if $(DOC_MODULE).types is non-empty.
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I$(srcdir)			\
 	-I$(top_srcdir)			\
 	-I$(top_builddir)		\
diff --git a/src/Makefile.am b/src/Makefile.am
index fc44c75..1b12c37 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -6,7 +6,7 @@ NULL =
 
 EXTRA_DIST =
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I$(top_builddir) -I$(top_srcdir)	 		\
 	-DPACKAGE_LIBEXEC_DIR=\""$(libexecdir)"\" 		\
 	-DPACKAGE_SYSCONF_DIR=\""$(sysconfdir)"\" 		\
diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index 3c01087..b80c5f4 100644
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -9,7 +9,7 @@ EXTRA_DIST = \
 	integration-test	\
 	$(NULL)
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I$(top_builddir) -I$(top_srcdir)	 		\
 	-I$(top_builddir)/src -I$(top_srcdir)/src 		\
 	-DPACKAGE_LIBEXEC_DIR=\""$(libexecdir)"\" 		\
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 392f06e..7f775e7 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -2,7 +2,7 @@
 
 NULL =
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I$(top_builddir) -I$(top_srcdir)	 		\
 	-DPACKAGE_LIBEXEC_DIR=\""$(libexecdir)"\" 		\
 	-DPACKAGE_SYSCONF_DIR=\""$(sysconfdir)"\" 		\
diff --git a/udisks/Makefile.am b/udisks/Makefile.am
index c1d440e..eb0a766 100644
--- a/udisks/Makefile.am
+++ b/udisks/Makefile.am
@@ -4,22 +4,6 @@ SUBDIRS =
 
 NULL =
 
-INCLUDES = \
-	-I$(top_builddir) -I$(top_srcdir)	 		\
-	-DPACKAGE_LIBEXEC_DIR=\""$(libexecdir)"\" 		\
-	-DPACKAGE_SYSCONF_DIR=\""$(sysconfdir)"\" 		\
-	-DPACKAGE_DATA_DIR=\""$(datadir)"\" 			\
-	-DPACKAGE_BIN_DIR=\""$(bindir)"\" 			\
-	-DPACKAGE_LOCALSTATE_DIR=\""$(localstatedir)"\" 	\
-	-DPACKAGE_LOCALE_DIR=\""$(localedir)"\" 		\
-	-DPACKAGE_LIB_DIR=\""$(libdir)"\" 			\
-	-D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT			\
-	-DUDISKS_COMPILATION					\
-	$(GLIB_CFLAGS) 						\
-	$(GIO_CFLAGS)						\
-	$(WARN_CFLAGS)						\
-	$(NULL)
-
 $(dbus_built_sources) : Makefile.am $(top_srcdir)/data/org.freedesktop.UDisks2.xml
 	gdbus-codegen							                \
 		--interface-prefix org.freedesktop.UDisks2.                          	\
@@ -86,6 +70,19 @@ libudisks2_la_SOURCES =									\
 
 libudisks2_la_CPPFLAGS = 				\
 	-DG_LOG_DOMAIN=\"libudisks2\"			\
+	-I$(top_builddir) -I$(top_srcdir)	 		\
+	-DPACKAGE_LIBEXEC_DIR=\""$(libexecdir)"\" 		\
+	-DPACKAGE_SYSCONF_DIR=\""$(sysconfdir)"\" 		\
+	-DPACKAGE_DATA_DIR=\""$(datadir)"\" 			\
+	-DPACKAGE_BIN_DIR=\""$(bindir)"\" 			\
+	-DPACKAGE_LOCALSTATE_DIR=\""$(localstatedir)"\" 	\
+	-DPACKAGE_LOCALE_DIR=\""$(localedir)"\" 		\
+	-DPACKAGE_LIB_DIR=\""$(libdir)"\" 			\
+	-D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT			\
+	-DUDISKS_COMPILATION					\
+	$(GLIB_CFLAGS) 						\
+	$(GIO_CFLAGS)						\
+	$(WARN_CFLAGS)						\
 	$(NULL)
 
 libudisks2_la_CFLAGS = 					\
-- 
1.8.5.3