[sheepdog] [PATCH] Use AM_CPPFLAGS instead of INCLUDES

YunQiang Su wzssyqa at gmail.com
Sun Sep 22 11:43:38 CEST 2013


INCLUDES are being warned by new automake (1.13)

Signed-off-by: YunQiang Su <wzssyqa at gmail.com>
---
 dog/Makefile.am      | 2 +-
 lib/Makefile.am      | 2 +-
 sheep/Makefile.am    | 2 +-
 sheepfs/Makefile.am  | 2 +-
 shepherd/Makefile.am | 4 ++--
 5 files changed, 6 insertions(+), 6 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 496c588..a066b3b 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
-- 
1.8.4.rc3




More information about the sheepdog mailing list