[PATCHv2] linux-generic: make: fix distribution build for inlines.h

Message ID 1473277939-26074-1-git-send-email-bill.fischofer@linaro.org
State New
Headers show

Commit Message

Bill Fischofer Sept. 7, 2016, 7:52 p.m.
Resolve bug https://bugs.linaro.org/show_bug.cgi?id=2507 by looking for
the constructed file include/plat/inlines.h in the builddir, not the
srcdir.

Signed-off-by: Bill Fischofer <bill.fischofer@linaro.org>

---
 platform/linux-generic/Makefile.am | 2 +-
 test/Makefile.inc                  | 4 +++-
 test/linux-generic/Makefile.inc    | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

-- 
2.5.0

Patch

diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am
index ae3cbba..92a0124 100644
--- a/platform/linux-generic/Makefile.am
+++ b/platform/linux-generic/Makefile.am
@@ -72,7 +72,7 @@  odpapiplatinclude_HEADERS = \
 		  $(srcdir)/include/odp/api/plat/crypto_types.h \
 		  $(srcdir)/include/odp/api/plat/event_types.h \
 		  $(srcdir)/include/odp/api/plat/init_types.h \
-		  $(srcdir)/include/odp/api/plat/inlines.h \
+		  $(builddir)/include/odp/api/plat/inlines.h \
 		  $(srcdir)/include/odp/api/plat/packet_types.h \
 		  $(srcdir)/include/odp/api/plat/packet_io_types.h \
 		  $(srcdir)/include/odp/api/plat/pool_types.h \
diff --git a/test/Makefile.inc b/test/Makefile.inc
index 5def923..fcbedfa 100644
--- a/test/Makefile.inc
+++ b/test/Makefile.inc
@@ -9,7 +9,9 @@  LDADD = $(PRE_LDADD) $(LIB)/libodphelper-linux.la $(LIB)/libodp-linux.la
 INCFLAGS = -I$(top_srcdir)/test \
 	-I$(top_srcdir)/platform/@with_platform@/include \
 	-I$(top_srcdir)/include \
-	-I$(top_srcdir)/helper/include
+	-I$(top_srcdir)/helper/include \
+	-I$(top_builddir)/platform/@with_platform@/include
+
 AM_CFLAGS += $(INCFLAGS)
 AM_CXXFLAGS = $(INCFLAGS)
 
diff --git a/test/linux-generic/Makefile.inc b/test/linux-generic/Makefile.inc
index b26324f..920daa9 100644
--- a/test/linux-generic/Makefile.inc
+++ b/test/linux-generic/Makefile.inc
@@ -13,4 +13,5 @@  INCODP = -I$(top_srcdir)/test \
 	 -I$(top_srcdir)/platform/@with_platform@/include \
 	 -I$(top_srcdir)/platform/@with_platform@/arch/$(ARCH_DIR) \
 	 -I$(top_srcdir)/include \
-	 -I$(top_srcdir)/helper/include
+	 -I$(top_srcdir)/helper/include \
+	 -I$(top_builddir)/platform/@with_platform@/include