[glib] Silence automake

[Matthias Clasen <matthiasc src gnome org>]

commit ab328469f5cab5681e5564893938a48fe5c2222f
Author: Matthias Clasen <mclasen redhat com>
Date:   Sat Feb 2 22:54:15 2013 -0500

    Silence automake
    
    automake doesn't like INCLUDES anymore.

 docs/reference/gio/Makefile.am                     |    2 +-
 .../gio/gdbus-object-manager-example/Makefile.am   |    6 +++---
 docs/reference/gobject/Makefile.am                 |    5 +++--
 gio/gdbus-2.0/codegen/Makefile.am                  |    1 -
 gio/tests/Makefile.am                              |   16 ++++++++--------
 gio/tests/gdbus-object-manager-example/Makefile.am |    2 +-
 glib/gnulib/Makefile.am                            |    8 ++++++--
 glib/libcharset/Makefile.am                        |    5 +++--
 gobject/tests/Makefile.am                          |    7 ++++---
 tests/gobject/Makefile.am                          |    2 +-
 tests/refcount/Makefile.am                         |    2 +-
 11 files changed, 31 insertions(+), 25 deletions(-)
---
diff --git a/docs/reference/gio/Makefile.am b/docs/reference/gio/Makefile.am
index 64d95fe..99606d3 100644
--- a/docs/reference/gio/Makefile.am
+++ b/docs/reference/gio/Makefile.am
@@ -84,7 +84,7 @@ IGNORE_HFILES = \
 
 # CFLAGS and LDFLAGS for compiling scan program. Only needed
 # if $(DOC_MODULE).types is non-empty.
-INCLUDES = \
+AM_CPPFLAGS = 				\
 	$(gio_INCLUDES)			\
 	$(GLIB_DEBUG_FLAGS)
 
diff --git a/docs/reference/gio/gdbus-object-manager-example/Makefile.am b/docs/reference/gio/gdbus-object-manager-example/Makefile.am
index 90c10aa..53acd51 100644
--- a/docs/reference/gio/gdbus-object-manager-example/Makefile.am
+++ b/docs/reference/gio/gdbus-object-manager-example/Makefile.am
@@ -17,16 +17,16 @@ HFILE_GLOB=$(top_builddir)/gio/tests/gdbus-object-manager-example/*.h
 CFILE_GLOB=$(top_builddir)/gio/tests/gdbus-object-manager-example/*.c
 
 # Headers to ignore
-IGNORE_HFILES=				\
+IGNORE_HFILES =				\
 	$(NULL)
 
 # CFLAGS and LDFLAGS for compiling scan program. Only needed
 # if $(DOC_MODULE).types is non-empty.
-INCLUDES = \
+AM_CPPFLAGS = 				\
 	$(gio_INCLUDES)			\
 	$(GLIB_DEBUG_FLAGS)
 
-GTKDOC_LIBS = \
+GTKDOC_LIBS = 						\
 	$(top_builddir)/glib/libglib-2.0.la		\
 	$(top_builddir)/gobject/libgobject-2.0.la	\
 	$(top_builddir)/gmodule/libgmodule-2.0.la	\
diff --git a/docs/reference/gobject/Makefile.am b/docs/reference/gobject/Makefile.am
index 48d88f8..dd89464 100644
--- a/docs/reference/gobject/Makefile.am
+++ b/docs/reference/gobject/Makefile.am
@@ -33,11 +33,12 @@ IGNORE_HFILES = \
 
 # CFLAGS and LDFLAGS for compiling scan program. Only needed
 # if $(DOC_MODULE).types is non-empty.
-INCLUDES = \
+AM_CPPFLAGS = 				\
 	-I$(srcdir) 			\
 	$(gobject_INCLUDES) 		\
 	$(GLIB_DEBUG_FLAGS)
-GTKDOC_LIBS = \
+
+GTKDOC_LIBS = 					\
 	$(top_builddir)/glib/libglib-2.0.la	\
 	$(top_builddir)/gobject/libgobject-2.0.la
 
diff --git a/gio/gdbus-2.0/codegen/Makefile.am b/gio/gdbus-2.0/codegen/Makefile.am
index 5111487..1afdaf0 100644
--- a/gio/gdbus-2.0/codegen/Makefile.am
+++ b/gio/gdbus-2.0/codegen/Makefile.am
@@ -3,7 +3,6 @@ include $(top_srcdir)/Makefile.decl
 NULL =
 bin_SCRIPTS =
 CLEANFILES =
-EXTRA_DIST =
 
 codegendir = $(datadir)/glib-2.0/codegen
 codegen_PYTHON =						\
diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am
index d33b7f0..1f8e2cb 100644
--- a/gio/tests/Makefile.am
+++ b/gio/tests/Makefile.am
@@ -6,14 +6,14 @@ include $(top_srcdir)/Makefile.decl
 
 SUBDIRS = gdbus-object-manager-example services
 
-INCLUDES = 			\
-	-DG_LOG_DOMAIN=\"GLib-GIO\" \
-	$(gio_INCLUDES)		\
-	$(GLIB_DEBUG_FLAGS)	\
-	-I$(top_builddir)/gio	\
-	-I$(top_srcdir)/gio	\
-	$(DBUS1_CFLAGS)		\
-	-DSRCDIR=\""$(srcdir)"\" \
+AM_CPPFLAGS = 				\
+	-DG_LOG_DOMAIN=\"GLib-GIO\" 	\
+	$(gio_INCLUDES)			\
+	$(GLIB_DEBUG_FLAGS)		\
+	-I$(top_builddir)/gio		\
+	-I$(top_srcdir)/gio		\
+	$(DBUS1_CFLAGS)			\
+	-DSRCDIR=\""$(srcdir)"\" 	\
 	-DTEST_SERVICES=\""$(abs_top_builddir)/gio/tests/services"\"
 
 
diff --git a/gio/tests/gdbus-object-manager-example/Makefile.am b/gio/tests/gdbus-object-manager-example/Makefile.am
index 9861d0e..6875210 100644
--- a/gio/tests/gdbus-object-manager-example/Makefile.am
+++ b/gio/tests/gdbus-object-manager-example/Makefile.am
@@ -4,7 +4,7 @@ CLEANFILES =
 
 include $(top_srcdir)/Makefile.decl
 
-INCLUDES = 			\
+AM_CPPFLAGS = 			\
 	-g 			\
 	$(gio_INCLUDES)		\
 	$(GLIB_DEBUG_FLAGS)	\
diff --git a/glib/gnulib/Makefile.am b/glib/gnulib/Makefile.am
index 8ad4889..03e1d18 100644
--- a/glib/gnulib/Makefile.am
+++ b/glib/gnulib/Makefile.am
@@ -1,8 +1,12 @@
 ## Process this file with automake to produce Makefile.in
 include $(top_srcdir)/Makefile.decl
 
-INCLUDES = $(glib_INCLUDES) -DG_LOG_DOMAIN=\"GLib\" \
-	$(GLIB_DEBUG_FLAGS) -DG_DISABLE_DEPRECATED -DGLIB_COMPILATION 
+AM_CPPFLAGS = 				\
+	$(glib_INCLUDES) 		\
+	-DG_LOG_DOMAIN=\"GLib\" 	\
+	$(GLIB_DEBUG_FLAGS) 		\
+	-DG_DISABLE_DEPRECATED 		\
+	-DGLIB_COMPILATION
 
 noinst_LTLIBRARIES = libgnulib.la
 
diff --git a/glib/libcharset/Makefile.am b/glib/libcharset/Makefile.am
index 0dd4f50..fb9a978 100644
--- a/glib/libcharset/Makefile.am
+++ b/glib/libcharset/Makefile.am
@@ -1,8 +1,9 @@
 ## Process this file with automake to produce Makefile.in
 include $(top_srcdir)/Makefile.decl
 
-INCLUDES = 			\
-	-DLIBDIR=\"$(libdir)\" $(config_h_INCLUDES)
+AM_CPPFLAGS = 				\
+	-DLIBDIR=\"$(libdir)\" 		\
+	$(config_h_INCLUDES)
 
 noinst_LTLIBRARIES = libcharset.la
 
diff --git a/gobject/tests/Makefile.am b/gobject/tests/Makefile.am
index 212cbda..28bd09d 100644
--- a/gobject/tests/Makefile.am
+++ b/gobject/tests/Makefile.am
@@ -1,9 +1,10 @@
 include $(top_srcdir)/Makefile.decl
 
 AM_CPPFLAGS = 					\
-	-DG_LOG_DOMAIN=\"GLib-GObject\"
-
-INCLUDES = -g $(gobject_INCLUDES) $(GLIB_DEBUG_FLAGS)
+	-g					\
+	-DG_LOG_DOMAIN=\"GLib-GObject\"		\
+	$(gobject_INCLUDES)			\
+	$(GLIB_DEBUG_FLAGS)
 
 if CROSS_COMPILING
   glib_genmarshal=$(GLIB_GENMARSHAL)
diff --git a/tests/gobject/Makefile.am b/tests/gobject/Makefile.am
index 9679e05..e766b7a 100644
--- a/tests/gobject/Makefile.am
+++ b/tests/gobject/Makefile.am
@@ -1,6 +1,6 @@
 include $(top_srcdir)/Makefile.decl
 
-INCLUDES =					\
+AM_CPPFLAGS =					\
 	$(gmodule_INCLUDES)			\
 	-DGLIB_DISABLE_DEPRECATION_WARNINGS	\
 	$(GLIB_DEBUG_FLAGS)
diff --git a/tests/refcount/Makefile.am b/tests/refcount/Makefile.am
index 3a7f8f5..34daca6 100644
--- a/tests/refcount/Makefile.am
+++ b/tests/refcount/Makefile.am
@@ -1,6 +1,6 @@
 include $(top_srcdir)/Makefile.decl
 
-INCLUDES =					\
+AM_CPPFLAGS =					\
 	$(gmodule_INCLUDES) 			\
 	-DGLIB_DISABLE_DEPRECATION_WARNINGS	\
 	$(GLIB_DEBUG_FLAGS)