From: Tomasz Kłoczko <kloczek@github.com>
Date: Wed, 12 May 2021 20:35:40 +0000 (+0000)
Subject: automake: replace INCLUDES by CPPFLAGS
X-Git-Tag: v2.0.1~22
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b38b947a670850d0bd2816140676c32984ab9b31;p=thirdparty%2Flibcgroup.git

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 9de48223..7d461c2e 100644
--- 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 72e4a4c0..103bb67e 100644
--- 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 7cba2636..2d744d9b 100644
--- 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 bd5a91df..db4594c0 100644
--- 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 690f34ea..f39ed6ec 100644
--- 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