automake: replace INCLUDES by CPPFLAGS

automake shows warnings like below:

src/Makefile.am:16: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS')
src/Makefile.am: installing 'build-aux/depcomp'
src/bindings/Makefile.am:2: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS')
src/daemon/Makefile.am:3: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS')
src/pam/Makefile.am:1: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS')
src/tools/Makefile.am:3: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS')

Signed-off-by: Tomasz Kłoczko <kloczek@github.com>
Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>

diff --git a/src/Makefile.am b/src/Makefile.am
index 9de482231d787e86a14929adbb19cc8f69c7a85d..7d461c2e0742df63913b0ef67fbf386e65e5bb29 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -13,7 +13,7 @@ AM_YFLAGS = -d
 
 CLEANFILES = lex.c parse.c parse.h
 
-INCLUDES = -I$(top_srcdir)/include
+CPPFLAGS = -I$(top_srcdir)/include
 lib_LTLIBRARIES = libcgroup.la libcgroupfortesting.la
 libcgroup_la_SOURCES = parse.h parse.y lex.l api.c config.c libcgroup-internal.h libcgroup.map wrapper.c log.c
 libcgroup_la_LIBADD = -lpthread $(CODE_COVERAGE_LIBS)

diff --git a/src/bindings/Makefile.am b/src/bindings/Makefile.am
index 72e4a4c016014f0dcb8c4cb431b4e4ee17b2fa6d..103bb67e9c6d566ec1ad076298de76f58d50d4cf 100644 (file)
--- a/src/bindings/Makefile.am
+++ b/src/bindings/Makefile.am
@@ -1,5 +1,5 @@
 SUBDIRS = .
-INCLUDES = -I$(top_srcdir)/include
+CPPFLAGS = -I$(top_srcdir)/include
 
 lib_LTLIBRARIES = _libcgroup.la
 _libcgroup_la_SOURCES = libcgroup.c

diff --git a/src/daemon/Makefile.am b/src/daemon/Makefile.am
index 7cba2636177423378aab37848dd03dd06ba86580..2d744d9bcbd8d0d65b65e12fa4e74b7b0b36604f 100644 (file)
--- a/src/daemon/Makefile.am
+++ b/src/daemon/Makefile.am
@@ -1,6 +1,6 @@
 @CODE_COVERAGE_RULES@
 
-INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/include
+CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/include
 
 if WITH_DAEMON
 

diff --git a/src/pam/Makefile.am b/src/pam/Makefile.am
index bd5a91df2238f61a44071faa2cda6168ddf44937..db4594c0aab33bb8f4b0ed6dd481e476314194e9 100644 (file)
--- a/src/pam/Makefile.am
+++ b/src/pam/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I $(top_srcdir)/include
+CPPFLAGS = -I $(top_srcdir)/include
 
 if WITH_PAM
 

diff --git a/src/tools/Makefile.am b/src/tools/Makefile.am
index 690f34ea6038a3ea1cd9643c01c2ca0246f5add1..f39ed6ec89e5e7eec7173c5e22f06594746fecf7 100644 (file)
--- a/src/tools/Makefile.am
+++ b/src/tools/Makefile.am
@@ -1,6 +1,6 @@
 @CODE_COVERAGE_RULES@
 
-INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/include
+CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/include
 LDADD = $(top_builddir)/src/libcgroup.la -lpthread
 
 if WITH_TOOLS