[gentoo-commits] proj/sandbox:master commit in: src/, /, libsbutil/, libsandbox/

[gentoo-commits] proj/sandbox:master commit in: src/, /, libsbutil/, libsandbox/

[Mike Frysinger]

commit:     a1f1c854fc887b49d3a9205b0494c07f12d5ef6e
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 23 04:47:32 2021 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Sat Oct 23 04:47:32 2021 +0000
URL:        https://gitweb.gentoo.org/proj/sandbox.git/commit/?id=a1f1c854

build: hoist -Itop_srcdir to common AM_CPPFLAGS

Every subdir sets this var this way, so might as well unify it.
We keep very few files in here, so shouldn't be a future problem.

Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>

 Makefile.am         | 4 +++-
 libsandbox/local.mk | 1 -
 libsbutil/local.mk  | 1 -
 src/local.mk        | 1 -
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index c01f973..cd5e3b3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,8 @@
 ACLOCAL_AMFLAGS  = -I m4
 MAKEFLAGS = --no-print-directory
-AM_CPPFLAGS = $(SANDBOX_DEFINES)
+AM_CPPFLAGS = \
+	$(SANDBOX_DEFINES) \
+	-I$(top_srcdir)
 
 SUBDIRS = tests
 

diff --git a/libsandbox/local.mk b/libsandbox/local.mk
index f0ef01f..1a9c5f9 100644
--- a/libsandbox/local.mk
+++ b/libsandbox/local.mk
@@ -3,7 +3,6 @@ lib_LTLIBRARIES += %D%/libsandbox.la
 %C%_libsandbox_la_CPPFLAGS = \
 	$(AM_CPPFLAGS) \
 	-I%D% \
-	-I$(top_srcdir) \
 	-I$(top_srcdir)/%D% \
 	-I$(top_srcdir)/libsbutil \
 	-I$(top_srcdir)/libsbutil/include

diff --git a/libsbutil/local.mk b/libsbutil/local.mk
index 0133751..126c7ce 100644
--- a/libsbutil/local.mk
+++ b/libsbutil/local.mk
@@ -2,7 +2,6 @@ noinst_LTLIBRARIES += %D%/libsbutil.la
 
 %C%_libsbutil_la_CPPFLAGS = \
 	$(AM_CPPFLAGS) \
-	-I$(top_srcdir) \
 	-I$(top_srcdir)/%D% \
 	-I$(top_srcdir)/%D%/include
 %C%_libsbutil_la_LDFLAGS = -no-undefined

diff --git a/src/local.mk b/src/local.mk
index 1fe2b31..61877ae 100644
--- a/src/local.mk
+++ b/src/local.mk
@@ -2,7 +2,6 @@ bin_PROGRAMS += %D%/sandbox
 
 %C%_sandbox_CPPFLAGS = \
 	$(AM_CPPFLAGS) \
-	-I$(top_srcdir) \
 	-I$(top_srcdir)/libsbutil \
 	-I$(top_srcdir)/libsbutil/include