[gnome-online-accounts] build: Clean up uses of INCLUDES and _CPPFLAGS

[Debarshi Ray <debarshir src gnome org>]

commit 331b73f3cb6b482f6b4a1c5797919c3914fae74b
Author: Debarshi Ray <debarshir gnome org>
Date:   Tue Apr 22 14:04:18 2014 +0200

    build: Clean up uses of INCLUDES and _CPPFLAGS
    
    INCLUDES is deprecated in favour of AM_CPPFLAGS and per-target
    _CPPFLAGS. Since AM_CPPFLAGS is ignored in preference to a per-target
    _CPPFLAGS variable, we should define the latter only when it is needed.
    
    Fixes: https://bugzilla.gnome.org/726570

 doc/Makefile.am             |    2 +-
 src/daemon/Makefile.am      |    9 +++------
 src/examples/Makefile.am    |    2 +-
 src/goa/Makefile.am         |    7 ++-----
 src/goabackend/Makefile.am  |    7 ++-----
 src/goaidentity/Makefile.am |    9 +++------
 6 files changed, 12 insertions(+), 24 deletions(-)
---
diff --git a/doc/Makefile.am b/doc/Makefile.am
index bdeb48f..0631321 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/daemon/Makefile.am b/src/daemon/Makefile.am
index 9b9cd79..9fdb115 100644
--- a/src/daemon/Makefile.am
+++ b/src/daemon/Makefile.am
@@ -1,10 +1,12 @@
 NULL =
 
-INCLUDES =                                                     \
+AM_CPPFLAGS =                                                  \
        -I$(top_builddir)/src -I$(top_srcdir)/src               \
        -I$(top_builddir)/src/goa                               \
        -I$(top_builddir)/src/goaidentity                       \
        -I$(top_srcdir)/src/goaidentity                         \
+       -DG_LOG_DOMAIN=\"goa-daemon\"                           \
+       -DGOA_BACKEND_COMPILATION                               \
        -DPACKAGE_LIBEXEC_DIR=\""$(libexecdir)"\"               \
        -DPACKAGE_SYSCONF_DIR=\""$(sysconfdir)"\"               \
        -DPACKAGE_DATA_DIR=\""$(pkgdatadir)"\"                  \
@@ -30,11 +32,6 @@ goa_daemon_SOURCES =                                                 \
        goatpaccountlinker.h    goatpaccountlinker.c            \
        $(NULL)
 
-goa_daemon_CPPFLAGS =                                          \
-       -DG_LOG_DOMAIN=\"goa-daemon\"                           \
-       -DGOA_BACKEND_COMPILATION                               \
-       $(NULL)
-
 goa_daemon_CFLAGS =                                            \
        $(GLIB_CFLAGS)                                          \
        $(GTK_CFLAGS)                                           \
diff --git a/src/examples/Makefile.am b/src/examples/Makefile.am
index 5fffefa..d70fc0d 100644
--- a/src/examples/Makefile.am
+++ b/src/examples/Makefile.am
@@ -1,7 +1,7 @@
 
 NULL =
 
-INCLUDES =                                                     \
+AM_CPPFLAGS =                                                  \
        -I$(top_builddir)/src -I$(top_srcdir)/src               \
        -I$(top_builddir)/src/goa                               \
        -DPACKAGE_LIBEXEC_DIR=\""$(libexecdir)"\"               \
diff --git a/src/goa/Makefile.am b/src/goa/Makefile.am
index 9302966..7c75a6c 100644
--- a/src/goa/Makefile.am
+++ b/src/goa/Makefile.am
@@ -5,9 +5,10 @@ CLEANFILES =
 DISTCLEANFILES =
 EXTRA_DIST =
 
-INCLUDES =                                                     \
+AM_CPPFLAGS =                                                  \
        -I$(top_builddir)/src -I$(top_srcdir)/src               \
        -I$(top_builddir)/src/goa                               \
+       -DG_LOG_DOMAIN=\"Goa\"                                  \
        -DPACKAGE_LIBEXEC_DIR=\""$(libexecdir)"\"               \
        -DPACKAGE_SYSCONF_DIR=\""$(sysconfdir)"\"               \
        -DPACKAGE_DATA_DIR=\""$(pkgdatadir)"\"                  \
@@ -91,10 +92,6 @@ libgoa_1_0_la_SOURCES =                                              \
        goaversion.h                    goaversion.c            \
        $(NULL)
 
-libgoa_1_0_la_CPPFLAGS =                                       \
-       -DG_LOG_DOMAIN=\"Goa\"                                  \
-       $(NULL)
-
 libgoa_1_0_la_CFLAGS =                                         \
        -DGOA_COMPILATION                                       \
        $(GLIB_CFLAGS)                                          \
diff --git a/src/goabackend/Makefile.am b/src/goabackend/Makefile.am
index 17da5c3..2e126ac 100644
--- a/src/goabackend/Makefile.am
+++ b/src/goabackend/Makefile.am
@@ -3,12 +3,13 @@ NULL =
 CLEANFILES =
 EXTRA_DIST =
 
-INCLUDES =                                                     \
+AM_CPPFLAGS =                                                  \
        -I$(top_builddir)/src -I$(top_srcdir)/src               \
        -I$(top_builddir)/src -I$(top_srcdir)/src               \
        -I$(top_builddir)/src/goa                               \
        -I$(top_srcdir)/src/goaidentity                         \
        -I$(top_builddir)/src/goaidentity                       \
+       -DG_LOG_DOMAIN=\"GoaBackend\"                           \
        -DPACKAGE_LIBEXEC_DIR=\""$(libexecdir)"\"               \
        -DPACKAGE_SYSCONF_DIR=\""$(sysconfdir)"\"               \
        -DPACKAGE_DATA_DIR=\""$(pkgdatadir)"\"                  \
@@ -90,10 +91,6 @@ libgoa_backend_1_0_la_SOURCES +=                                     \
        goakerberosprovider.h           goakerberosprovider.c
 endif
 
-libgoa_backend_1_0_la_CPPFLAGS =                               \
-       -DG_LOG_DOMAIN=\"GoaBackend\"                           \
-       $(NULL)
-
 libgoa_backend_1_0_la_CFLAGS =                                 \
        -DGOA_BACKEND_COMPILATION                               \
        -DGOA_API_IS_SUBJECT_TO_CHANGE                          \
diff --git a/src/goaidentity/Makefile.am b/src/goaidentity/Makefile.am
index 43fe26c..8e11f6d 100644
--- a/src/goaidentity/Makefile.am
+++ b/src/goaidentity/Makefile.am
@@ -3,10 +3,12 @@ BUILT_SOURCES = $(NULL)
 EXTRA_DIST = $(NULL)
 CLEANFILES= $(NULL)
 
-INCLUDES =                                                     \
+AM_CPPFLAGS =                                                  \
        -I$(top_builddir)/src -I$(top_srcdir)/src               \
        -I$(top_builddir)/src/goa                               \
        -I$(top_srcdir)/src/goabackend                          \
+       -DG_LOG_DOMAIN=\"libgoaidentity\"                       \
+       -DGOA_BACKEND_COMPILATION                               \
        -DPACKAGE_LIBEXEC_DIR=\""$(libexecdir)"\"               \
        -DPACKAGE_SYSCONF_DIR=\""$(sysconfdir)"\"               \
        -DPACKAGE_DATA_DIR=\""$(pkgdatadir)"\"                  \
@@ -102,11 +104,6 @@ libgoaidentity_la_SOURCES =                                        \
        $(identity_sources)                                     \
        $(NULL)
 
-libgoaidentity_la_CPPFLAGS =                                   \
-       -DG_LOG_DOMAIN=\"libgoaidentity\"                       \
-       -DGOA_BACKEND_COMPILATION                               \
-       $(NULL)
-
 libgoaidentity_la_CFLAGS =                                     \
        $(GLIB_CFLAGS)                                          \
        $(GTK_CFLAGS)                                           \