From 85c61fcf261befcd0bd6737d3808a3f08b1a11c9 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tomasz=20K=C5=82oczko?= Date: Wed, 12 May 2021 20:36:17 +0000 Subject: [PATCH] automake: replace CPPFLAGS by AM_CPPFLAGS MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit To not interfere with env $CPPFLAGS it is better to use AM_CPPFLAGS Signed-off-by: Tomasz Kłoczko Signed-off-by: Tom Hromatka --- src/Makefile.am | 2 +- src/bindings/Makefile.am | 2 +- src/daemon/Makefile.am | 2 +- src/pam/Makefile.am | 2 +- src/tools/Makefile.am | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 7d461c2e..18398e2b 100644 --- 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 103bb67e..d7e32bcd 100644 --- 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 2d744d9b..4f5ca609 100644 --- 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 18740446..3fbf1709 100644 --- 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 f39ed6ec..0fc1f36e 100644 --- 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 -- 2.47.2