| Message ID | 1473280144-5684-1-git-send-email-bill.fischofer@linaro.org |
|---|---|
| State | New |
| Headers | show |
On 09/07/16 23:29, Bill Fischofer wrote: > 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(-) > > 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..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 in v3 you changed alphabetical order above, but did not change here. > + > 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 and here. Maxim.
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..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
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