From: Dmitry Eremin-Solenikov <dmitry.ereminsoleni...@linaro.org> Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsoleni...@linaro.org> --- /** Email created from pull request 165 (lumag:improve-build-3) ** https://github.com/Linaro/odp/pull/165 ** Patch: https://github.com/Linaro/odp/pull/165.patch ** Base sha: 42184679185ce0c979e065349360167e3fce6ca0 ** Merge commit sha: c9bd3cdd91bd495988653511548fd4525579db79 **/ helper/Makefile.am | 14 +++++++------- helper/test/Makefile.am | 2 +- platform/linux-generic/Makefile.am | 12 ++++++------ test/Makefile.inc | 3 +-- 4 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/helper/Makefile.am b/helper/Makefile.am index ca512ff1..fa503f1a 100644 --- a/helper/Makefile.am +++ b/helper/Makefile.am @@ -2,13 +2,13 @@ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = $(top_builddir)/pkgconfig/libodphelper.pc LIB = $(top_builddir)/lib -AM_CFLAGS += -I$(srcdir)/include -AM_CFLAGS += -I$(top_srcdir)/platform/@with_platform@/include -AM_CFLAGS += -I$(top_srcdir)/include -AM_CFLAGS += -I$(top_srcdir)/include/odp/arch/@ARCH_ABI@ -AM_CFLAGS += -I$(top_builddir)/platform/@with_platform@/include -AM_CFLAGS += -I$(top_srcdir)/platform/@with_platform@/arch/@ARCH_DIR@ -AM_CFLAGS += -I$(top_builddir)/include +AM_CPPFLAGS += -I$(srcdir)/include +AM_CPPFLAGS += -I$(top_srcdir)/platform/@with_platform@/include +AM_CPPFLAGS += -I$(top_srcdir)/include +AM_CPPFLAGS += -I$(top_srcdir)/include/odp/arch/@ARCH_ABI@ +AM_CPPFLAGS += -I$(top_builddir)/platform/@with_platform@/include +AM_CPPFLAGS += -I$(top_srcdir)/platform/@with_platform@/arch/@ARCH_DIR@ +AM_CPPFLAGS += -I$(top_builddir)/include AM_LDFLAGS += -version-number '$(ODPHELPER_LIBSO_VERSION)' diff --git a/helper/test/Makefile.am b/helper/test/Makefile.am index 00997f10..fdc15f96 100644 --- a/helper/test/Makefile.am +++ b/helper/test/Makefile.am @@ -17,7 +17,7 @@ INCFLAGS = \ ODP_PLATFORM=${with_platform} -AM_CFLAGS += $(INCFLAGS) +AM_CPPFLAGS += $(INCFLAGS) AM_LDFLAGS += -static EXECUTABLES = chksum$(EXEEXT) \ diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index eada421c..e644505e 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -3,12 +3,12 @@ include $(top_srcdir)/platform/Makefile.inc -AM_CFLAGS += -I$(srcdir)/include -AM_CFLAGS += -I$(top_srcdir)/include -AM_CFLAGS += -I$(top_srcdir)/include/odp/arch/@ARCH_ABI@ -AM_CFLAGS += -I$(top_builddir)/include -AM_CFLAGS += -Iinclude -AM_CFLAGS += -I$(top_srcdir)/platform/$(with_platform)/arch/$(ARCH_DIR) +AM_CPPFLAGS += -I$(srcdir)/include +AM_CPPFLAGS += -I$(top_srcdir)/include +AM_CPPFLAGS += -I$(top_srcdir)/include/odp/arch/@ARCH_ABI@ +AM_CPPFLAGS += -I$(top_builddir)/include +AM_CPPFLAGS += -Iinclude +AM_CPPFLAGS += -I$(top_srcdir)/platform/$(with_platform)/arch/$(ARCH_DIR) AM_CPPFLAGS += $(OPENSSL_CPPFLAGS) AM_CPPFLAGS += $(DPDK_CPPFLAGS) diff --git a/test/Makefile.inc b/test/Makefile.inc index d701ebd7..f5bb7674 100644 --- a/test/Makefile.inc +++ b/test/Makefile.inc @@ -15,9 +15,8 @@ INCFLAGS = \ -I$(top_srcdir)/test \ -I$(top_builddir)/include -AM_CFLAGS += $(INCFLAGS) +AM_CPPFLAGS = $(INCFLAGS) AM_CFLAGS += $(CUNIT_CFLAGS) -AM_CXXFLAGS = $(INCFLAGS) AM_LDFLAGS += -L$(LIB)