[sheepdog] [PATCH stable-0.7 1/7] Use AM_CPPFLAGS instead of INCLUDES

[Hitoshi Mitake]

From: YunQiang Su <wzssyqa at gmail.com>

INCLUDES are being warned by new automake (1.13)

Signed-off-by: YunQiang Su <wzssyqa at gmail.com>
Signed-off-by: MORITA Kazutaka <morita.kazutaka at lab.ntt.co.jp>
---
 dog/Makefile.am              | 2 +-
 lib/Makefile.am              | 2 +-
 sheep/Makefile.am            | 2 +-
 sheepfs/Makefile.am          | 2 +-
 shepherd/Makefile.am         | 4 ++--
 tests/unit/dog/Makefile.am   | 2 +-
 tests/unit/mock/Makefile.am  | 2 +-
 tests/unit/sheep/Makefile.am | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/dog/Makefile.am b/dog/Makefile.am
index 49d05ff..cfb0b20 100644
--- a/dog/Makefile.am
+++ b/dog/Makefile.am
@@ -19,7 +19,7 @@ MAINTAINERCLEANFILES	= Makefile.in
 
 AM_CFLAGS		=
 
-INCLUDES		= -I$(top_builddir)/include -I$(top_srcdir)/include
+AM_CPPFLAGS		= -I$(top_builddir)/include -I$(top_srcdir)/include
 
 sbin_PROGRAMS		= dog
 
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 22edf6e..87f80df 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,6 +1,6 @@
 MAINTAINERCLEANFILES    = Makefile.in
 
-INCLUDES                = -I$(top_builddir)/include -I$(top_srcdir)/include
+AM_CPPFLAGS                = -I$(top_builddir)/include -I$(top_srcdir)/include
 
 noinst_LIBRARIES	= libsheepdog.a
 
diff --git a/sheep/Makefile.am b/sheep/Makefile.am
index bc810be..aa5a689 100644
--- a/sheep/Makefile.am
+++ b/sheep/Makefile.am
@@ -19,7 +19,7 @@ MAINTAINERCLEANFILES	= Makefile.in
 
 AM_CFLAGS		=
 
-INCLUDES		= -I$(top_builddir)/include -I$(top_srcdir)/include \
+AM_CPPFLAGS		= -I$(top_builddir)/include -I$(top_srcdir)/include \
 			  $(libcpg_CFLAGS) $(libcfg_CFLAGS) $(libacrd_CFLAGS)
 
 sbin_PROGRAMS		= sheep
diff --git a/sheepfs/Makefile.am b/sheepfs/Makefile.am
index 10b8c3b..c3d539d 100644
--- a/sheepfs/Makefile.am
+++ b/sheepfs/Makefile.am
@@ -19,7 +19,7 @@ MAINTAINERCLEANFILES	= Makefile.in
 
 AM_CFLAGS		= $(fuse_CFLAGS) -DFUSE_USE_VERSION=26
 
-INCLUDES		= -I$(top_builddir)/include -I$(top_srcdir)/include
+AM_CPPFLAGS		= -I$(top_builddir)/include -I$(top_srcdir)/include
 
 sbin_PROGRAMS		= sheepfs
 
diff --git a/shepherd/Makefile.am b/shepherd/Makefile.am
index f7fd998..33a3da6 100644
--- a/shepherd/Makefile.am
+++ b/shepherd/Makefile.am
@@ -19,7 +19,7 @@ MAINTAINERCLEANFILES	= Makefile.in
 
 AM_CFLAGS		=
 
-INCLUDES		= -I$(top_builddir)/include -I$(top_srcdir)/include
+AM_CPPFLAGS		= -I$(top_builddir)/include -I$(top_srcdir)/include
 
 sbin_PROGRAMS		= shepherd
 
@@ -31,7 +31,7 @@ shepherd_DEPENDENCIES	= ../lib/libsheepdog.a
 EXTRA_DIST		=
 
 lint:
-	-splint $(INCLUDES) $(LINT_FLAGS) $(CFLAGS) *.c
+	-splint $(AM_CPPFLAGS) $(LINT_FLAGS) $(CFLAGS) *.c
 
 all-local:
 	@echo Built shepherd
diff --git a/tests/unit/dog/Makefile.am b/tests/unit/dog/Makefile.am
index 6d5978b..462df2b 100644
--- a/tests/unit/dog/Makefile.am
+++ b/tests/unit/dog/Makefile.am
@@ -4,7 +4,7 @@ TESTS			= test_common
 
 check_PROGRAMS		= ${TESTS}
 
-INCLUDES		= -I$(top_srcdir)/include			\
+AM_CPPFLAGS		= -I$(top_srcdir)/include			\
 			  -I$(top_srcdir)/dog				\
 			  -I$(top_srcdir)/dog/farm			\
 			  -I../mock					\
diff --git a/tests/unit/mock/Makefile.am b/tests/unit/mock/Makefile.am
index b7c0c32..9f198d7 100644
--- a/tests/unit/mock/Makefile.am
+++ b/tests/unit/mock/Makefile.am
@@ -1,6 +1,6 @@
 MAINTAINERCLEANFILES    = Makefile.in
 
-INCLUDES                = -I$(top_builddir)/include -I$(top_srcdir)/include
+AM_CPPFLAGS                = -I$(top_builddir)/include -I$(top_srcdir)/include
 
 noinst_LIBRARIES	= libmock.a
 
diff --git a/tests/unit/sheep/Makefile.am b/tests/unit/sheep/Makefile.am
index e27899a..76464c2 100644
--- a/tests/unit/sheep/Makefile.am
+++ b/tests/unit/sheep/Makefile.am
@@ -4,7 +4,7 @@ TESTS			= test_vdi test_cluster_driver
 
 check_PROGRAMS		= ${TESTS}
 
-INCLUDES		= -I$(top_srcdir)/include			\
+AM_CPPFLAGS		= -I$(top_srcdir)/include			\
 			  -I$(top_srcdir)/sheep				\
 			  -I../mock					\
 			  @CHECK_CFLAGS@
-- 
1.8.1.2