[libgdata] build: Use AM_C[PP]FLAGS instead of INCLUDES

[Philip Withnall <pwithnall src gnome org>]

commit 469ea1e1fab91df489399fe42ce760d6eb7d2b6e
Author: Philip Withnall <philip tecnocode co uk>
Date:   Tue Jul 30 14:18:44 2013 +0200

    build: Use AM_C[PP]FLAGS instead of INCLUDES
    
    Let’s live in the future.

 docs/reference/Makefile.am |    3 ++-
 gdata/tests/Makefile.am    |   25 ++++++++++++++-----------
 2 files changed, 16 insertions(+), 12 deletions(-)
---
diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
index ecfa9a5..c230d5e 100644
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -86,7 +86,8 @@ expand_content_files=
 # signals and properties.
 # e.g. INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
 # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
-INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(GDATA_CFLAGS)
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
+AM_CFLAGS = $(GDATA_CFLAGS)
 GTKDOC_LIBS=$(top_builddir)/gdata/libgdata.la
 
 # This includes the standard gtk-doc make rules, copied by gtkdocize.
diff --git a/gdata/tests/Makefile.am b/gdata/tests/Makefile.am
index d2ed75e..dadd8b3 100644
--- a/gdata/tests/Makefile.am
+++ b/gdata/tests/Makefile.am
@@ -1,16 +1,19 @@
 include $(top_srcdir)/gtester.mk
 
-INCLUDES = \
-       -I$(top_srcdir)/                                \
-       -I$(top_srcdir)/gdata                           \
-       $(GDK_PIXBUF_CFLAGS)                            \
-       -DTEST_FILE_DIR="\"$(top_srcdir)/gdata/tests/\""\
-       -DG_LOG_DOMAIN=\"libgdata\"                     \
-       -DLIBGDATA_DISABLE_DEPRECATED                   \
-       $(DISABLE_DEPRECATED)                           \
-       $(WARN_CFLAGS)                                  \
-       $(GDATA_CFLAGS)                                 \
-       $(GNOME_CFLAGS)
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/ \
+       -I$(top_srcdir)/gdata \
+       -DTEST_FILE_DIR="\"$(top_srcdir)/gdata/tests/\"" \
+       -DG_LOG_DOMAIN=\"libgdata\" \
+       -DLIBGDATA_DISABLE_DEPRECATED \
+       $(DISABLE_DEPRECATED) \
+       $(NULL)
+AM_CFLAGS = \
+       $(GDK_PIXBUF_CFLAGS) \
+       $(WARN_CFLAGS) \
+       $(GDATA_CFLAGS) \
+       $(GNOME_CFLAGS) \
+       $(NULL)
 
 LIBS = \
        $(top_builddir)/gdata/libgdata.la       \