[gnome-desktop] build: fix automake warnings

[Patrick Welche <pwelche src gnome org>]

commit 3fc0ffe3b205e0faa0c884c596c38ab5343cc17d
Author: Patrick Welche <prlw1 cam ac uk>
Date:   Thu Sep 11 16:39:03 2014 +0200

    build: fix automake warnings
    
    https://bugzilla.gnome.org/show_bug.cgi?id=736482

 docs/reference/gnome-desktop3/Makefile.am |    4 ++--
 libgnome-desktop/Makefile.am              |    2 +-
 tests/Makefile.am                         |    4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/docs/reference/gnome-desktop3/Makefile.am b/docs/reference/gnome-desktop3/Makefile.am
index ec67b01..d4f0779 100644
--- a/docs/reference/gnome-desktop3/Makefile.am
+++ b/docs/reference/gnome-desktop3/Makefile.am
@@ -69,9 +69,9 @@ expand_content_files=
 # CFLAGS and LDFLAGS for compiling gtkdoc-scangobj with your library.
 # Only needed if you are using gtkdoc-scangobj to dynamically query widget
 # signals and properties.
-# e.g. INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
+# e.g. AM_CPPFLAGS=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
 # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
-INCLUDES=$(GNOME_DESKTOP_CFLAGS) -I$(top_srcdir)/libgnome-desktop -DGNOME_DESKTOP_USE_UNSTABLE_API
+AM_CPPFLAGS=$(GNOME_DESKTOP_CFLAGS) -I$(top_srcdir)/libgnome-desktop -DGNOME_DESKTOP_USE_UNSTABLE_API
 GTKDOC_LIBS=$(GNOME_DESKTOP_LIBS) $(top_builddir)/libgnome-desktop/libgnome-desktop-3.la
 
 # This includes the standard gtk-doc make rules, copied by gtkdocize.
diff --git a/libgnome-desktop/Makefile.am b/libgnome-desktop/Makefile.am
index 7eabb67..79ed33f 100644
--- a/libgnome-desktop/Makefile.am
+++ b/libgnome-desktop/Makefile.am
@@ -144,7 +144,7 @@ typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
 CLEANFILES += $(gir_DATA) $(typelib_DATA)
 endif
 
-EXTRA_DIST = \
+EXTRA_DIST += \
        idle-monitor.xml                        \
        xrandr.xml                              \
        gnome-desktop-3.0.pc.in                 \
diff --git a/tests/Makefile.am b/tests/Makefile.am
index e1bd748..1e04072 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -10,14 +10,14 @@ AM_CPPFLAGS =                                                       \
 
 AM_CFLAGS = -g $(WARN_CFLAGS)
 
-TESTS_ENVIRONMENT = G_ENABLE_DIAGNOSTIC=0
+TESTS_ENVIRONMENT += G_ENABLE_DIAGNOSTIC=0
 
 test_programs =                        \
        wall-clock              \
        gtk-reftest             \
        $(NULL)
 
-EXTRA_DIST =                   \
+EXTRA_DIST +=                  \
        C.ref.ui                \
        C.ui                    \
        en_US.utf-8.ref.ui      \