Don't use the deprecated INCLUDES in Makefile.am

8 files changed, 9 insertions, 9 deletions

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 9a27a58..8f01af5 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -30,7 +30,7 @@ IGNORE_HFILES= \
 
 # CFLAGS and LDFLAGS for compiling scan program. Only needed
 # if $(DOC_MODULE).types is non-empty.
-INCLUDES = \
+AM_CPPFLAGS = \
 	$(DBUS_GLIB_CFLAGS)		\
 	$(GLIB_CFLAGS)			\
 	-I$(top_srcdir)/libupower-glib 		\
diff --git a/libupower-glib/Makefile.am b/libupower-glib/Makefile.am
index 9c6ac5b..7444f54 100644
--- a/libupower-glib/Makefile.am
+++ b/libupower-glib/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = \
+AM_CPPFLAGS = \
 	$(GLIB_CFLAGS)						\
 	$(DBUS_GLIB_CFLAGS)					\
 	-I$(top_builddir)					\
@@ -65,7 +65,7 @@ introspection_sources = $(libupower_glib_include_HEADERS) $(libupower_glib_la_SO
 
 UPowerGlib-1.0.gir: libupower-glib.la
 UPowerGlib_1_0_gir_INCLUDES = GObject-2.0 Gio-2.0
-UPowerGlib_1_0_gir_CFLAGS = $(INCLUDES)
+UPowerGlib_1_0_gir_CFLAGS = $(AM_CPPFLAGS)
 UPowerGlib_1_0_gir_SCANNERFLAGS = --identifier-prefix=Up --symbol-prefix=up_ --warn-all --add-include-path=$(srcdir)
 UPowerGlib_1_0_gir_LIBS = libupower-glib.la
 UPowerGlib_1_0_gir_FILES = $(introspection_sources)
diff --git a/src/Makefile.am b/src/Makefile.am
index 4119793..f19ed24 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,7 +2,7 @@
 
 SUBDIRS = dummy freebsd linux openbsd
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I$(top_builddir)/src -I$(top_srcdir)/src		\
 	-DPACKAGE_LIBEXEC_DIR=\""$(libexecdir)"\"		\
 	-DPACKAGE_SYSCONF_DIR=\""$(sysconfdir)"\"		\
diff --git a/src/dummy/Makefile.am b/src/dummy/Makefile.am
index dcd30af..713a5e7 100644
--- a/src/dummy/Makefile.am
+++ b/src/dummy/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I$(top_builddir)/src -I$(top_srcdir)/src		\
 	-DUP_COMPILATION					\
 	-DG_LOG_DOMAIN=\"UPower-Dummy\"				\
diff --git a/src/freebsd/Makefile.am b/src/freebsd/Makefile.am
index 9d91542..53b718d 100644
--- a/src/freebsd/Makefile.am
+++ b/src/freebsd/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I$(top_builddir)/src -I$(top_srcdir)/src		\
 	-DUP_COMPILATION					\
 	-DG_LOG_DOMAIN=\"UPower-Freebsd\"			\
diff --git a/src/linux/Makefile.am b/src/linux/Makefile.am
index 4bb64bc..5b58183 100644
--- a/src/linux/Makefile.am
+++ b/src/linux/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I$(top_builddir)/src -I$(top_srcdir)/src		\
 	-DUP_COMPILATION					\
 	-DG_LOG_DOMAIN=\"UPower-Linux\"				\
diff --git a/src/openbsd/Makefile.am b/src/openbsd/Makefile.am
index 472eb50..d3e61aa 100644
--- a/src/openbsd/Makefile.am
+++ b/src/openbsd/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I$(top_builddir)/src -I$(top_srcdir)/src		\
 	-DUP_COMPILATION					\
 	-DG_LOG_DOMAIN=\"UPower-Openbsd\"			\
diff --git a/tools/Makefile.am b/tools/Makefile.am
index df1d2e7..f676bf4 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-DUP_COMPILATION					\
 	-DG_LOG_DOMAIN=\"UPower\"				\
 	-I$(top_srcdir)						\