diff options
| author | Anders Roxell <anders.roxell@linaro.org> | 2015-08-07 12:52:17 +0200 |
|---|---|---|
| committer | Maxim Uvarov <maxim.uvarov@linaro.org> | 2015-08-07 14:15:21 +0300 |
| commit | bb00e77670ac298d81c75e0cb21a3d89e09b59d8 (patch) | |
| tree | a5d382c446527814d0e9dbcec977eae7f0a5a1cb | |
| parent | d929144d7a7d0a6645847d52892094f2f62ab64e (diff) | |
linux-generic: Makefile.am: fix basename conflicts
Building generated this warning message:
"copying selected object files to avoid basename conflicts..."
Reported-by: Mile Holmes <mike.holmes@linaro.org>
Signed-off-by: Anders Roxell <anders.roxell@linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org>
| -rw-r--r-- | platform/linux-generic/Makefile.am | 8 | ||||
| -rw-r--r-- | platform/linux-generic/arch/linux/odp_time_cycles.c (renamed from platform/linux-generic/arch/linux/odp_time.c) | 0 | ||||
| -rw-r--r-- | platform/linux-generic/arch/mips64/odp_time_cycles.c (renamed from platform/linux-generic/arch/mips64/odp_time.c) | 0 | ||||
| -rw-r--r-- | platform/linux-generic/arch/x86/odp_time_cycles.c (renamed from platform/linux-generic/arch/x86/odp_time.c) | 0 |
4 files changed, 4 insertions, 4 deletions
diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index c0f722014..ed4add521 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -160,9 +160,9 @@ __LIB__libodp_la_SOURCES = \ odp_timer.c \ odp_version.c \ odp_weak.c \ - arch/@ARCH@/odp_time.c + arch/@ARCH@/odp_time_cycles.c EXTRA_DIST = \ - arch/linux/odp_time.c \ - arch/mips64/odp_time.c \ - arch/x86/odp_time.c + arch/linux/odp_time_cycles.c \ + arch/mips64/odp_time_cycles.c \ + arch/x86/odp_time_cycles.c diff --git a/platform/linux-generic/arch/linux/odp_time.c b/platform/linux-generic/arch/linux/odp_time_cycles.c index 4dc0764ed..4dc0764ed 100644 --- a/platform/linux-generic/arch/linux/odp_time.c +++ b/platform/linux-generic/arch/linux/odp_time_cycles.c diff --git a/platform/linux-generic/arch/mips64/odp_time.c b/platform/linux-generic/arch/mips64/odp_time_cycles.c index 4fb790b19..4fb790b19 100644 --- a/platform/linux-generic/arch/mips64/odp_time.c +++ b/platform/linux-generic/arch/mips64/odp_time_cycles.c diff --git a/platform/linux-generic/arch/x86/odp_time.c b/platform/linux-generic/arch/x86/odp_time_cycles.c index a11156184..a11156184 100644 --- a/platform/linux-generic/arch/x86/odp_time.c +++ b/platform/linux-generic/arch/x86/odp_time_cycles.c |