automake: replace CPPFLAGS by AM_CPPFLAGS

To not interfere with env $CPPFLAGS it is better to use AM_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 7d461c2e0742df63913b0ef67fbf386e65e5bb29..18398e2b336763700218f48c1ac625f91ed51872 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -13,7 +13,7 @@ AM_YFLAGS = -d
 
 CLEANFILES = lex.c parse.c parse.h
 
-CPPFLAGS = -I$(top_srcdir)/include
+AM_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 103bb67e9c6d566ec1ad076298de76f58d50d4cf..d7e32bcd8848411843362186e4a84f776937e85a 100644 (file)
--- a/src/bindings/Makefile.am
+++ b/src/bindings/Makefile.am
@@ -1,5 +1,5 @@
 SUBDIRS = .
-CPPFLAGS = -I$(top_srcdir)/include
+AM_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 2d744d9bcbd8d0d65b65e12fa4e74b7b0b36604f..4f5ca609c4f5bd382940cf5987c9dedb031ca920 100644 (file)
--- a/src/daemon/Makefile.am
+++ b/src/daemon/Makefile.am
@@ -1,6 +1,6 @@
 @CODE_COVERAGE_RULES@
 
-CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/include
+AM_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 18740446b3fe4242e8bc6a9d71ac58b7381dff5e..3fbf170924befa56b0c37dcb79656648b0e9be73 100644 (file)
--- a/src/pam/Makefile.am
+++ b/src/pam/Makefile.am
@@ -1,4 +1,4 @@
-CPPFLAGS = -I $(top_srcdir)/include
+AM_CPPFLAGS = -I $(top_srcdir)/include
 
 if WITH_PAM
 

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