This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "".
The branch, master has been updated via 1d43e53c96246c5625ae619d0667b179ea8bd4b2 (commit) from 032915e5988d0e1da0562193b8bc925600cdb5f6 (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit 1d43e53c96246c5625ae619d0667b179ea8bd4b2 Author: Bill Fischofer bill.fischofer@linaro.org Date: Thu Sep 8 16:00:39 2016 +0300
linux-generic: make: fix distribution build for inlines.h
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 Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org
diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index ae3cbba..e3c0f56 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -61,6 +61,7 @@ odpapiinclude_HEADERS = \
odpapiplatincludedir= $(includedir)/odp/api/plat odpapiplatinclude_HEADERS = \ + $(builddir)/include/odp/api/plat/inlines.h \ $(srcdir)/include/odp/api/plat/atomic_inlines.h \ $(srcdir)/include/odp/api/plat/atomic_types.h \ $(srcdir)/include/odp/api/plat/barrier_types.h \ @@ -72,7 +73,6 @@ 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 \ $(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..db5a2fa 100644 --- a/test/Makefile.inc +++ b/test/Makefile.inc @@ -6,10 +6,13 @@ LIB = $(top_builddir)/lib #before libodp by setting PRE_LDADD before the inclusion. LDADD = $(PRE_LDADD) $(LIB)/libodphelper-linux.la $(LIB)/libodp-linux.la
-INCFLAGS = -I$(top_srcdir)/test \ - -I$(top_srcdir)/platform/@with_platform@/include \ +INCFLAGS = \ + -I$(top_builddir)/platform/@with_platform@/include \ + -I$(top_srcdir)/helper/include \ -I$(top_srcdir)/include \ - -I$(top_srcdir)/helper/include + -I$(top_srcdir)/platform/@with_platform@/include \ + -I$(top_srcdir)/test + AM_CFLAGS += $(INCFLAGS) AM_CXXFLAGS = $(INCFLAGS)
diff --git a/test/linux-generic/Makefile.inc b/test/linux-generic/Makefile.inc index b26324f..eba1d2d 100644 --- a/test/linux-generic/Makefile.inc +++ b/test/linux-generic/Makefile.inc @@ -9,8 +9,10 @@ LIB = $(top_builddir)/lib LIBODP = $(LIB)/libodphelper-linux.la $(LIB)/libodp-linux.la
INCCUNIT_COMMON = -I$(top_srcdir)/test/common_plat/common -INCODP = -I$(top_srcdir)/test \ - -I$(top_srcdir)/platform/@with_platform@/include \ - -I$(top_srcdir)/platform/@with_platform@/arch/$(ARCH_DIR) \ +INCODP = \ + -I$(top_builddir)/platform/@with_platform@/include \ + -I$(top_srcdir)/helper/include \ -I$(top_srcdir)/include \ - -I$(top_srcdir)/helper/include + -I$(top_srcdir)/platform/@with_platform@/arch/$(ARCH_DIR) \ + -I$(top_srcdir)/platform/@with_platform@/include \ + -I$(top_srcdir)/test
-----------------------------------------------------------------------
Summary of changes: platform/linux-generic/Makefile.am | 2 +- test/Makefile.inc | 9 ++++++--- test/linux-generic/Makefile.inc | 10 ++++++---- 3 files changed, 13 insertions(+), 8 deletions(-)
hooks/post-receive