diff options
author | Dmitry Eremin-Solenikov <dmitry.ereminsolenikov@linaro.org> | 2017-09-05 18:29:24 +0300 |
---|---|---|
committer | Maxim Uvarov <maxim.uvarov@linaro.org> | 2017-09-08 17:44:34 +0300 |
commit | 3be7ab995e5f2c4472b20008f63299d93a3a806c (patch) | |
tree | d816e1e3b41fd2885b0f387f91ac0de420f7fc32 /helper/Makefile.am | |
parent | 1882b608abc37314f90bdd2de8ef7f0501a8d5d8 (diff) |
build: drop platorm/linux-generic/Makefile.inc
Mandate that platform provides
platform/$(with_platform)/arch/$(ARCH_DIR) directory and reference it
directly from all Makefile.am/.inc files. Main reason for this change is
to allow automake to process all includes at the time of Makefile.am ->
Makefile.in conversion. Currently it can not determine path for
platform/@with_platform@/Makefile.inc, thus inclusion is left for main
make invocation.
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov@linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer@linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org>
Diffstat (limited to 'helper/Makefile.am')
-rw-r--r-- | helper/Makefile.am | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/helper/Makefile.am b/helper/Makefile.am index c69fd678d..ca512ff1a 100644 --- a/helper/Makefile.am +++ b/helper/Makefile.am @@ -1,5 +1,3 @@ -include $(top_srcdir)/platform/@with_platform@/Makefile.inc - pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = $(top_builddir)/pkgconfig/libodphelper.pc @@ -9,6 +7,7 @@ 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_LDFLAGS += -version-number '$(ODPHELPER_LIBSO_VERSION)' |