[network-manager-applet/danw/cleanup: 1/5] get rid of obsolete INCLUDES in Makefile.am

[Dan Winship <danw src gnome org>]

commit 8d5d67e78b99090f8a69180f9071a1e00783f308
Author: Pavel Šimerda <psimerda redhat com>
Date:   Tue Nov 25 13:17:27 2014 +0100

    get rid of obsolete INCLUDES in Makefile.am
    
    https://bugzilla.gnome.org/show_bug.cgi?id=740680

 src/gconf-helpers/tests/Makefile.am |    3 +--
 src/gnome-bluetooth/Makefile.am     |    4 ++--
 src/utils/tests/Makefile.am         |    3 +--
 3 files changed, 4 insertions(+), 6 deletions(-)
---
diff --git a/src/gconf-helpers/tests/Makefile.am b/src/gconf-helpers/tests/Makefile.am
index f8e3d64..d92f275 100644
--- a/src/gconf-helpers/tests/Makefile.am
+++ b/src/gconf-helpers/tests/Makefile.am
@@ -1,5 +1,3 @@
-INCLUDES = -I$(top_srcdir)/src/utils
-
 noinst_PROGRAMS = test-upgrade
 
 test_upgrade_SOURCES = \
@@ -10,6 +8,7 @@ test_upgrade_SOURCES = \
        fake-gconf.c
 
 test_upgrade_CPPFLAGS = \
+       -I $(top_srcdir)/src/utils
        -I ${srcdir}/../ \
        -DTESTDIR=\"$(srcdir)\" \
        $(GTK_CFLAGS) \
diff --git a/src/gnome-bluetooth/Makefile.am b/src/gnome-bluetooth/Makefile.am
index dbf5373..0e4b95c 100644
--- a/src/gnome-bluetooth/Makefile.am
+++ b/src/gnome-bluetooth/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = \
+AM_CPPFLAGS = \
        -DDATADIR=\"$(datadir)\" \
        -DICONDIR=\"$(icondir)\" \
        -DLOCALEDIR="\"$(datadir)/locale\""     \
@@ -23,7 +23,7 @@ plugin_LTLIBRARIES = libnma.la
 libnma_la_SOURCES = $(BT_WIDGET_SOURCES)
 
 if WITH_MODEM_MANAGER_1
-libnma_la_CPPFLAGS = $(MM_GLIB_CFLAGS)
+libnma_la_CPPFLAGS = ${AM_CPPFLAGS} $(MM_GLIB_CFLAGS)
 endif
 
 libnma_la_LDFLAGS = -module -avoid-version
diff --git a/src/utils/tests/Makefile.am b/src/utils/tests/Makefile.am
index 6534f70..211488e 100644
--- a/src/utils/tests/Makefile.am
+++ b/src/utils/tests/Makefile.am
@@ -1,10 +1,9 @@
-INCLUDES = -I$(top_srcdir)/src/utils
-
 noinst_PROGRAMS = test-utils
 
 test_utils_SOURCES = test-utils.c
 
 test_utils_CPPFLAGS = \
+       -I $(top_srcdir)/src/utils
        $(GTK_CFLAGS) \
        $(NMA_CFLAGS)