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 <adriaan.schmidt@siemens.com>
Reviewed-by: Kamalesh Babulal <kamalesh.babulal@oracle.com>
Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>

diff --git a/src/Makefile.am b/src/Makefile.am
index c871c1d572630c5cf61b002ac9e9e05a374dcaee..12c94b37d98173b215b83a013d80ee8fe1426fee 100644 (file)
--- 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 4f5ca609c4f5bd382940cf5987c9dedb031ca920..2616294e23404f7f9b85863c8e319ef197eec25e 100644 (file)
--- 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 3fbf170924befa56b0c37dcb79656648b0e9be73..017ef68f5fa2e4ceb682397d6fdeced99280ad3c 100644 (file)
--- 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 49638ac00f796f9545fe71a5215e6fa3548f863c..71092d5cb57696f1af8699b24c9fa650e8d14819 100644 (file)
--- 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 f6df32f8016a1fa70c651b95da00e9a9a8f1836a..2e51e3d1455b3d402fc97644e20b99edeff6f7dd 100644 (file)
--- 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