From 9c56ff5d3e0e3ee256b540479fa1a7b09f871b8e Mon Sep 17 00:00:00 2001
From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Fri, 27 Sep 2013 17:09:18 +0100
Subject: [PATCH 03/11] Use AM_CPPFLAGS instead of deprecated INCLUDES

---
 mission-control-plugins/Makefile.am | 4 ++--
 plugins/Makefile.am                 | 2 +-
 server/Makefile.am                  | 2 +-
 src/Makefile.am                     | 6 +++---
 tests/Makefile.am                   | 4 ++--
 tests/twisted/Makefile.am           | 2 +-
 util/Makefile.am                    | 2 +-
 7 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/mission-control-plugins/Makefile.am b/mission-control-plugins/Makefile.am
index 0e38dd4..ae4c848 100644
--- a/mission-control-plugins/Makefile.am
+++ b/mission-control-plugins/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = \
+AM_CPPFLAGS = \
 	$(TELEPATHY_CFLAGS) \
 	$(DBUS_CFLAGS) \
 	$(GLIB_CFLAGS) \
@@ -69,7 +69,7 @@ Android.mk: Makefile.am $(BUILT_SOURCES)
 	 -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
 	 -:SOURCES $(BUILT_SOURCES) $(libmission_control_plugins_la_SOURCES) \
 	 -:CFLAGS $(DEFAULT_INCLUDES) $(DEFS) $(CFLAGS) $(AM_CFLAGS) \
-	 -:CPPFLAGS $(CPPFLAGS) $(AM_CPPFLAGS) $(INCLUDES) \
+	 -:CPPFLAGS $(CPPFLAGS) $(AM_CPPFLAGS) \
 	 -:LDFLAGS $(libmission_control_plugins_la_LIBADD) \
 	> $@
 
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 23ccc6c..8203d20 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = \
+AM_CPPFLAGS = \
 	$(TELEPATHY_CFLAGS) \
 	$(DBUS_CFLAGS) \
 	$(GLIB_CFLAGS) \
diff --git a/server/Makefile.am b/server/Makefile.am
index 5be1cdc..b18a442 100644
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@ -47,7 +47,7 @@ Android.mk: Makefile.am
 	 -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
 	 -:SOURCES $(mission_control_5_SOURCES) \
 	 -:CFLAGS $(DEFAULT_INCLUDES) $(DEFS) $(CFLAGS) $(AM_CFLAGS) \
-	 -:CPPFLAGS $(CPPFLAGS) $(AM_CPPFLAGS) $(INCLUDES) \
+	 -:CPPFLAGS $(CPPFLAGS) $(AM_CPPFLAGS) \
 	  -DBUILD_AS_ANDROID_SERVICE \
 	 -:LDFLAGS $(mission_control_5_LDADD) \
 	 -:LIBFILTER_STATIC mcd-convenience mission-control-plugins \
diff --git a/src/Makefile.am b/src/Makefile.am
index 17f644e..c237518 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = \
+AM_CPPFLAGS = \
 	   $(TELEPATHY_CFLAGS) \
 	   $(DBUS_CFLAGS) \
 	   $(GLIB_CFLAGS) \
@@ -97,7 +97,7 @@ libmcd_convenience_la_LIBADD = \
 
 if ENABLE_LIBACCOUNTS_SSO
 libmcd_convenience_la_LIBADD += $(LIBACCOUNTS_SSO_LIBS)
-INCLUDES += $(LIBACCOUNTS_SSO_CFLAGS)
+AM_CPPFLAGS += $(LIBACCOUNTS_SSO_CFLAGS)
 endif
 
 if ENABLE_AEGIS
@@ -215,7 +215,7 @@ Android.mk: Makefile.am $(nodist_libmcd_convenience_la_SOURCES)
 	 -:TAGS eng debug \
 	 -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
 	 -:SOURCES $(libmcd_convenience_la_SOURCES) $(nodist_libmcd_convenience_la_SOURCES) \
-	 -:CFLAGS $(DEFAULT_INCLUDES) $(INCLUDES) $(DEFS) $(CFLAGS) $(AM_CFLAGS) \
+	 -:CFLAGS $(DEFAULT_INCLUDES) $(DEFS) $(CFLAGS) $(AM_CFLAGS) \
 	 -:CPPFLAGS $(CPPFLAGS) $(AM_CPPFLAGS) \
 	 -:LDFLAGS $(libmcd_convenience_la_LIBADD) \
 	> $@
diff --git a/tests/Makefile.am b/tests/Makefile.am
index cf7edc9..c6166fb 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = \
+AM_CPPFLAGS = \
 	$(DBUS_CFLAGS) \
 	$(TELEPATHY_CFLAGS) \
 	-I$(top_srcdir) \
@@ -43,5 +43,5 @@ account_store_SOURCES = \
 if ENABLE_LIBACCOUNTS_SSO
 account_store_SOURCES += account-store-libaccounts.c account-store-libaccounts.h
 account_store_LDADD += $(LIBACCOUNTS_SSO_LIBS)
-INCLUDES += $(LIBACCOUNTS_SSO_CFLAGS)
+AM_CPPFLAGS += $(LIBACCOUNTS_SSO_CFLAGS)
 endif
diff --git a/tests/twisted/Makefile.am b/tests/twisted/Makefile.am
index 3ea6444..7fd0660 100644
--- a/tests/twisted/Makefile.am
+++ b/tests/twisted/Makefile.am
@@ -220,7 +220,7 @@ mc_debug_server_SOURCES = mc-debug-server.c
 mc_debug_server_LDADD = \
 	$(top_builddir)/src/libmcd-convenience.la
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I$(top_srcdir) -I$(top_builddir) \
 	-I$(top_srcdir)/src -I$(top_builddir)/src \
 	$(DBUS_CFLAGS) \
diff --git a/util/Makefile.am b/util/Makefile.am
index f506dd2..4a5a601 100644
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -37,7 +37,7 @@ Android.mk: Makefile.am
 	 -:EXECUTABLE mc-tool -:TAGS eng debug \
 	 -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
 	 -:SOURCES $(mc_tool_SOURCES) \
-	 -:CFLAGS $(DEFS) $(CFLAGS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	 -:CFLAGS $(DEFS) $(CFLAGS) $(DEFAULT_INCLUDES) \
 	  $(AM_CFLAGS) \
 	 -:CPPFLAGS $(CPPFLAGS) $(AM_CPPFLAGS) \
 	 -:LDFLAGS $(LDADD) \
-- 
1.8.4.rc3