From 9355f9a1bccca14480573b2144827dd64428a911 Mon Sep 17 00:00:00 2001 From: Adriaan Schmidt Date: Tue, 9 May 2023 14:51:56 +0200 Subject: [PATCH] fix: include paths for out-of-source builds This is so the generated libcgroup/init.h is found when not building in the source tree. Signed-off-by: Adriaan Schmidt Reviewed-by: Kamalesh Babulal Signed-off-by: Tom Hromatka --- src/Makefile.am | 2 +- src/daemon/Makefile.am | 2 +- src/pam/Makefile.am | 2 +- src/python/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 c871c1d5..12c94b37 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -14,7 +14,7 @@ AM_YFLAGS = -d CLEANFILES = lex.c parse.c parse.h -AM_CPPFLAGS = -I$(top_srcdir)/include +AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include VERSION_NUMBER = $(LIBRARY_VERSION_MAJOR):$(LIBRARY_VERSION_MINOR):$(LIBRARY_VERSION_RELEASE) TESTING_MAP_FILE = $(top_srcdir)/tests/gunit/libcgroup_unittest.map diff --git a/src/daemon/Makefile.am b/src/daemon/Makefile.am index 4f5ca609..2616294e 100644 --- a/src/daemon/Makefile.am +++ b/src/daemon/Makefile.am @@ -1,6 +1,6 @@ @CODE_COVERAGE_RULES@ -AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/include +AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/include -I$(top_builddir)/include if WITH_DAEMON diff --git a/src/pam/Makefile.am b/src/pam/Makefile.am index 3fbf1709..017ef68f 100644 --- a/src/pam/Makefile.am +++ b/src/pam/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS = -I $(top_srcdir)/include +AM_CPPFLAGS = -I $(top_srcdir)/include -I$(top_builddir)/include if WITH_PAM diff --git a/src/python/Makefile.am b/src/python/Makefile.am index 49638ac0..71092d5c 100644 --- a/src/python/Makefile.am +++ b/src/python/Makefile.am @@ -9,7 +9,7 @@ PY_DISTUTILS = \ VERSION_RELEASE="@PACKAGE_VERSION@" \ - CPPFLAGS="-I\${top_srcdir}/include ${AM_CPPFLAGS} ${CPPLAGS} -O2" \ + CPPFLAGS="-I\${top_srcdir}/include -I\${top_builddir}/include ${AM_CPPFLAGS} ${CPPLAGS} -O2" \ CFLAGS="$(CODE_COVERAGE_CFLAGS) ${AM_CFLAGS} ${CFLAGS}" \ LDFLAGS="$(CODE_COVERAGE_LIBS) ${AM_LDFLAGS} ${LDFLAGS}" \ ${PYTHON} ${srcdir}/setup.py diff --git a/src/tools/Makefile.am b/src/tools/Makefile.am index f6df32f8..2e51e3d1 100644 --- a/src/tools/Makefile.am +++ b/src/tools/Makefile.am @@ -1,6 +1,6 @@ @CODE_COVERAGE_RULES@ -AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/include +AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/include -I$(top_builddir)/include LDADD = $(top_builddir)/src/libcgroup.la -lpthread if WITH_TOOLS -- 2.47.2