From 48016fa297629a27db76fbc489dbff5ae672ed4e Mon Sep 17 00:00:00 2001
From: Ludovic Rousseau <ludovic.rousseau@gmail.com>
Date: Fri, 18 May 2012 07:38:42 +0000
Subject: [PATCH] warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or
 '*_CPPFLAGS')

---
 examples/Makefile.am       | 2 +-
 libnfc/Makefile.am         | 2 +-
 libnfc/buses/Makefile.am   | 2 +-
 libnfc/chips/Makefile.am   | 2 +-
 libnfc/drivers/Makefile.am | 2 +-
 test/Makefile.am           | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/examples/Makefile.am b/examples/Makefile.am
index e951883..60464ad 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -22,7 +22,7 @@ check_PROGRAMS = \
 		quick_start_example1
 
 # set the include path found by configure
-INCLUDES = $(all_includes) $(LIBNFC_CFLAGS)
+AM_CPPFLAGS = $(all_includes) $(LIBNFC_CFLAGS)
 
 AM_CFLAGS = -I$(top_srcdir)/libnfc -I$(top_srcdir)
 
diff --git a/libnfc/Makefile.am b/libnfc/Makefile.am
index 56c32de..f916633 100644
--- a/libnfc/Makefile.am
+++ b/libnfc/Makefile.am
@@ -1,7 +1,7 @@
 SUBDIRS = chips buses drivers .
 
 # set the include path found by configure
-INCLUDES = $(all_includes) $(LIBNFC_CFLAGS)
+AM_CPPFLAGS = $(all_includes) $(LIBNFC_CFLAGS)
 
 noinst_HEADERS = \
 		 drivers.h \
diff --git a/libnfc/buses/Makefile.am b/libnfc/buses/Makefile.am
index e28ac91..a5c498d 100644
--- a/libnfc/buses/Makefile.am
+++ b/libnfc/buses/Makefile.am
@@ -1,6 +1,6 @@
 
 # set the include path found by configure
-INCLUDES= $(all_includes) $(LIBNFC_CFLAGS)
+AM_CPPFLAGS = $(all_includes) $(LIBNFC_CFLAGS)
 
 noinst_HEADERS = uart.h
 noinst_LTLIBRARIES = libnfcbuses.la
diff --git a/libnfc/chips/Makefile.am b/libnfc/chips/Makefile.am
index 2359e78..db41240 100644
--- a/libnfc/chips/Makefile.am
+++ b/libnfc/chips/Makefile.am
@@ -1,6 +1,6 @@
 
 # set the include path found by configure
-INCLUDES= $(all_includes) $(LIBNFC_CFLAGS)
+AM_CPPFLAGS = $(all_includes) $(LIBNFC_CFLAGS)
 
 noinst_HEADERS = pn53x.h pn53x-internal.h
 noinst_LTLIBRARIES = libnfcchips.la
diff --git a/libnfc/drivers/Makefile.am b/libnfc/drivers/Makefile.am
index 3ad71ec..22c5407 100644
--- a/libnfc/drivers/Makefile.am
+++ b/libnfc/drivers/Makefile.am
@@ -1,5 +1,5 @@
 # set the include path found by configure
-INCLUDES= $(all_includes) $(LIBNFC_CFLAGS)
+AM_CPPFLAGS = $(all_includes) $(LIBNFC_CFLAGS)
 
 noinst_HEADERS = acr122_pcsc.h acr122_usb.h acr122s.h arygon.h pn532_uart.h pn53x_usb.h
 noinst_LTLIBRARIES = libnfcdrivers.la
diff --git a/test/Makefile.am b/test/Makefile.am
index 1e34224..a25af9b 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,6 +1,6 @@
 # $Id$
 
-INCLUDES = $(CUTTER_CFLAGS) $(LIBNFC_CFLAGS)
+AM_CPPFLAGS = $(CUTTER_CFLAGS) $(LIBNFC_CFLAGS)
 LIBS = $(CUTTER_LIBS)
 
 if WITH_CUTTER