[gnome-control-center] wacom: Use AM_CPPFLAGS rather than INCLUDES

[Bastien Nocera <hadess src gnome org>]

commit 2096cacaf5add8106b42bfa2367fe129b111eb1d
Author: Christophe Fergeau <cfergeau redhat com>
Date:   Wed Jun 25 11:56:04 2014 +0200

    wacom: Use AM_CPPFLAGS rather than INCLUDES
    
    This is deprecated in newer automake versions, and this causes warnings
    with automake 1.14:
    panels/printers/Makefile.am:3: warning: 'INCLUDES' is the old name for
    AM_CPPFLAGS' (or '*_CPPFLAGS')
    
    https://bugzilla.gnome.org/show_bug.cgi?id=732189

 panels/wacom/Makefile.am            |    4 ++--
 panels/wacom/calibrator/Makefile.am |    6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/panels/wacom/Makefile.am b/panels/wacom/Makefile.am
index e18d538..41908b4 100644
--- a/panels/wacom/Makefile.am
+++ b/panels/wacom/Makefile.am
@@ -3,7 +3,7 @@ cappletname = wacom
 
 SUBDIRS = calibrator
 
-INCLUDES =                                             \
+AM_CPPFLAGS =                                          \
        $(PANEL_CFLAGS)                                 \
        $(WACOM_PANEL_CFLAGS)                           \
        -I$(srcdir)/calibrator                          \
@@ -63,7 +63,7 @@ test_wacom_SOURCES =                  \
        gsd-input-helper.h              \
        gsd-enums.h
 
-test_wacom_CPPFLAGS = $(INCLUDES) -DFAKE_AREA
+test_wacom_CPPFLAGS = $(AM_CPPFLAGS) -DFAKE_AREA
 test_wacom_LDADD = $(PANEL_LIBS) $(WACOM_PANEL_LIBS) $(builddir)/calibrator/libwacom-calibrator-test.la
 
 resource_files = $(shell glib-compile-resources --sourcedir=$(srcdir) --generate-dependencies 
$(srcdir)/wacom.gresource.xml)
diff --git a/panels/wacom/calibrator/Makefile.am b/panels/wacom/calibrator/Makefile.am
index 72d7552..4559aef 100644
--- a/panels/wacom/calibrator/Makefile.am
+++ b/panels/wacom/calibrator/Makefile.am
@@ -1,7 +1,7 @@
 # This is used in PANEL_CFLAGS
 cappletname = wacom
 
-INCLUDES =                                             \
+AM_CPPFLAGS =                                          \
        $(PANEL_CFLAGS)                                 \
        $(WACOM_PANEL_CFLAGS)                           \
        -DGNOMELOCALEDIR="\"$(datadir)/locale\""        \
@@ -25,7 +25,7 @@ libwacom_calibrator_la_LDFLAGS = $(PANEL_LDFLAGS)
 
 libwacom_calibrator_test_la_SOURCES = $(libwacom_calibrator_la_SOURCES)
 
-libwacom_calibrator_test_la_CPPFLAGS = -DFAKE_AREA
+libwacom_calibrator_test_la_CPPFLAGS = -DFAKE_AREA $(AM_CPPFLAGS)
 libwacom_calibrator_test_la_LIBADD = $(libwacom_calibrator_la_LIBADD)
 libwacom_calibrator_test_la_LDFLAGS = $(libwacom_calibrator_la_LDFLAGS)
 
@@ -42,7 +42,7 @@ test_calibrator_SOURCES =             \
        cc-target-actor.c               \
        cc-target-actor.h
 
-test_calibrator_CPPFLAGS = $(INCLUDES)
+test_calibrator_CPPFLAGS = $(AM_CPPFLAGS)
 test_calibrator_LDADD = $(PANEL_LIBS) $(WACOM_PANEL_LIBS)
 
 -include $(top_srcdir)/git.mk