[PATCHv3] linux-gen: Makefile: Move EXTRA_DIST to to platform/Makefile.inc

Message ID 1469184742-14723-1-git-send-email-anders.roxell@linaro.org
State New
Headers show

Commit Message

Anders Roxell July 22, 2016, 10:52 a.m.
Make it easier for other platforms like odp-dpdk to reuse arch specific
files in EXTRA_DIST for "free".

Reported-by: Fathi Boudra <fathi.boudra@linaro.org>
Signed-off-by: Anders Roxell <anders.roxell@linaro.org>

---
 platform/Makefile.inc              | 17 +++++++++++++++++
 platform/linux-generic/Makefile.am | 17 -----------------
 2 files changed, 17 insertions(+), 17 deletions(-)

-- 
2.1.4

Comments

Maxim Uvarov July 22, 2016, 11:53 a.m. | #1
Merged,
Maxim.

On 07/22/16 13:52, Anders Roxell wrote:
> Make it easier for other platforms like odp-dpdk to reuse arch specific

> files in EXTRA_DIST for "free".

>

> Reported-by: Fathi Boudra <fathi.boudra@linaro.org>

> Signed-off-by: Anders Roxell <anders.roxell@linaro.org>

> ---

>   platform/Makefile.inc              | 17 +++++++++++++++++

>   platform/linux-generic/Makefile.am | 17 -----------------

>   2 files changed, 17 insertions(+), 17 deletions(-)

>

> diff --git a/platform/Makefile.inc b/platform/Makefile.inc

> index 053bd12..a44f88f 100644

> --- a/platform/Makefile.inc

> +++ b/platform/Makefile.inc

> @@ -60,3 +60,20 @@ odpapispecinclude_HEADERS = \

>   		  $(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

> +

> +EXTRA_DIST = \

> +	     arch/arm/odp/api/cpu_arch.h \

> +	     arch/arm/odp_cpu_arch.c \

> +	     arch/arm/odp_sysinfo_parse.c \

> +	     arch/default/odp/api/cpu_arch.h \

> +	     arch/default/odp_cpu_arch.c \

> +	     arch/default/odp_sysinfo_parse.c \

> +	     arch/mips64/odp/api/cpu_arch.h \

> +	     arch/mips64/odp_cpu_arch.c \

> +	     arch/mips64/odp_sysinfo_parse.c \

> +	     arch/powerpc/odp/api/cpu_arch.h \

> +	     arch/powerpc/odp_cpu_arch.c \

> +	     arch/powerpc/odp_sysinfo_parse.c \

> +	     arch/x86/odp/api/cpu_arch.h \

> +	     arch/x86/odp_cpu_arch.c \

> +	     arch/x86/odp_sysinfo_parse.c

> diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am

> index c8fd8cb..0cfd0fe 100644

> --- a/platform/linux-generic/Makefile.am

> +++ b/platform/linux-generic/Makefile.am

> @@ -186,23 +186,6 @@ __LIB__libodp_linux_la_SOURCES = \

>   			   arch/@ARCH_DIR@/odp_cpu_arch.c \

>   			   arch/@ARCH_DIR@/odp_sysinfo_parse.c

>   

> -EXTRA_DIST = \

> -	     arch/default/odp/api/cpu_arch.h \

> -	     arch/default/odp_cpu_arch.c \

> -	     arch/default/odp_sysinfo_parse.c \

> -	     arch/mips64/odp/api/cpu_arch.h \

> -	     arch/mips64/odp_cpu_arch.c \

> -	     arch/mips64/odp_sysinfo_parse.c \

> -	     arch/powerpc/odp/api/cpu_arch.h \

> -	     arch/powerpc/odp_cpu_arch.c \

> -	     arch/powerpc/odp_sysinfo_parse.c \

> -	     arch/x86/odp/api/cpu_arch.h \

> -	     arch/x86/odp_cpu_arch.c \

> -	     arch/x86/odp_sysinfo_parse.c \

> -	     arch/arm/odp/api/cpu_arch.h \

> -	     arch/arm/odp_cpu_arch.c \

> -	     arch/arm/odp_sysinfo_parse.c

> -

>   if HAVE_PCAP

>   __LIB__libodp_linux_la_SOURCES += pktio/pcap.c

>   endif

Patch

diff --git a/platform/Makefile.inc b/platform/Makefile.inc
index 053bd12..a44f88f 100644
--- a/platform/Makefile.inc
+++ b/platform/Makefile.inc
@@ -60,3 +60,20 @@  odpapispecinclude_HEADERS = \
 		  $(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
+
+EXTRA_DIST = \
+	     arch/arm/odp/api/cpu_arch.h \
+	     arch/arm/odp_cpu_arch.c \
+	     arch/arm/odp_sysinfo_parse.c \
+	     arch/default/odp/api/cpu_arch.h \
+	     arch/default/odp_cpu_arch.c \
+	     arch/default/odp_sysinfo_parse.c \
+	     arch/mips64/odp/api/cpu_arch.h \
+	     arch/mips64/odp_cpu_arch.c \
+	     arch/mips64/odp_sysinfo_parse.c \
+	     arch/powerpc/odp/api/cpu_arch.h \
+	     arch/powerpc/odp_cpu_arch.c \
+	     arch/powerpc/odp_sysinfo_parse.c \
+	     arch/x86/odp/api/cpu_arch.h \
+	     arch/x86/odp_cpu_arch.c \
+	     arch/x86/odp_sysinfo_parse.c
diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am
index c8fd8cb..0cfd0fe 100644
--- a/platform/linux-generic/Makefile.am
+++ b/platform/linux-generic/Makefile.am
@@ -186,23 +186,6 @@  __LIB__libodp_linux_la_SOURCES = \
 			   arch/@ARCH_DIR@/odp_cpu_arch.c \
 			   arch/@ARCH_DIR@/odp_sysinfo_parse.c
 
-EXTRA_DIST = \
-	     arch/default/odp/api/cpu_arch.h \
-	     arch/default/odp_cpu_arch.c \
-	     arch/default/odp_sysinfo_parse.c \
-	     arch/mips64/odp/api/cpu_arch.h \
-	     arch/mips64/odp_cpu_arch.c \
-	     arch/mips64/odp_sysinfo_parse.c \
-	     arch/powerpc/odp/api/cpu_arch.h \
-	     arch/powerpc/odp_cpu_arch.c \
-	     arch/powerpc/odp_sysinfo_parse.c \
-	     arch/x86/odp/api/cpu_arch.h \
-	     arch/x86/odp_cpu_arch.c \
-	     arch/x86/odp_sysinfo_parse.c \
-	     arch/arm/odp/api/cpu_arch.h \
-	     arch/arm/odp_cpu_arch.c \
-	     arch/arm/odp_sysinfo_parse.c
-
 if HAVE_PCAP
 __LIB__libodp_linux_la_SOURCES += pktio/pcap.c
 endif