Commit: eebd6b0 configure: the version cannot use a script Did generation of version.h which is done in $dest_dir. Includes paths have to be corrected accordingly.
Signed-off-by: Maxim Uvarov <maxim.uva...@linaro.org> --- v2: build.sh in some combination did not pass on v1, fix it (Mike). example/Makefile.inc | 3 ++- helper/Makefile.am | 1 + platform/Makefile.inc | 4 ++-- platform/linux-generic/Makefile.am | 1 + test/Makefile.inc | 3 ++- test/linux-generic/Makefile.inc | 1 + 6 files changed, 9 insertions(+), 4 deletions(-) diff --git a/example/Makefile.inc b/example/Makefile.inc index 9fb2f29..19d3994 100644 --- a/example/Makefile.inc +++ b/example/Makefile.inc @@ -7,6 +7,7 @@ AM_CFLAGS += \ -I$(top_srcdir)/platform/@with_platform@/include \ -I$(top_srcdir)/include/ \ -I$(top_srcdir)/helper/include \ - -I$(top_builddir)/platform/@with_platform@/include + -I$(top_builddir)/platform/@with_platform@/include \ + -I$(top_builddir)/include AM_LDFLAGS += -L$(LIB) diff --git a/helper/Makefile.am b/helper/Makefile.am index b6e6a1d..d09d900 100644 --- a/helper/Makefile.am +++ b/helper/Makefile.am @@ -8,6 +8,7 @@ AM_CFLAGS = -I$(srcdir)/include AM_CFLAGS += -I$(top_srcdir)/platform/@with_platform@/include AM_CFLAGS += -I$(top_srcdir)/include AM_CFLAGS += -I$(top_builddir)/platform/@with_platform@/include +AM_CFLAGS += -I$(top_builddir)/include AM_LDFLAGS += -version-number '$(ODPHELPER_LIBSO_VERSION)' diff --git a/platform/Makefile.inc b/platform/Makefile.inc index 432d1fd..2722946 100644 --- a/platform/Makefile.inc +++ b/platform/Makefile.inc @@ -57,8 +57,8 @@ odpapispecinclude_HEADERS = \ $(top_srcdir)/include/odp/api/spec/ticketlock.h \ $(top_srcdir)/include/odp/api/spec/time.h \ $(top_srcdir)/include/odp/api/spec/timer.h \ - $(top_srcdir)/include/odp/api/spec/traffic_mngr.h \ - $(top_srcdir)/include/odp/api/spec/version.h + $(top_builddir)/include/odp/api/spec/version.h \ + $(top_srcdir)/include/odp/api/spec/traffic_mngr.h EXTRA_DIST = \ arch/arm/odp/api/cpu_arch.h \ diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 0ec13d4..22cf6f3 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -6,6 +6,7 @@ include $(top_srcdir)/platform/@with_platform@/Makefile.inc AM_CFLAGS += -I$(srcdir)/include AM_CFLAGS += -I$(top_srcdir)/include +AM_CFLAGS += -I$(top_builddir)/include AM_CFLAGS += -Iinclude include_HEADERS = \ diff --git a/test/Makefile.inc b/test/Makefile.inc index db5a2fa..1ebc047 100644 --- a/test/Makefile.inc +++ b/test/Makefile.inc @@ -11,7 +11,8 @@ INCFLAGS = \ -I$(top_srcdir)/helper/include \ -I$(top_srcdir)/include \ -I$(top_srcdir)/platform/@with_platform@/include \ - -I$(top_srcdir)/test + -I$(top_srcdir)/test \ + -I$(top_builddir)/include AM_CFLAGS += $(INCFLAGS) AM_CXXFLAGS = $(INCFLAGS) diff --git a/test/linux-generic/Makefile.inc b/test/linux-generic/Makefile.inc index eba1d2d..36745fe 100644 --- a/test/linux-generic/Makefile.inc +++ b/test/linux-generic/Makefile.inc @@ -10,6 +10,7 @@ LIBODP = $(LIB)/libodphelper-linux.la $(LIB)/libodp-linux.la INCCUNIT_COMMON = -I$(top_srcdir)/test/common_plat/common INCODP = \ + -I$(top_builddir)/include \ -I$(top_builddir)/platform/@with_platform@/include \ -I$(top_srcdir)/helper/include \ -I$(top_srcdir)/include \ -- 2.7.1.250.gff4ea60