diff mbox

[2/2] platform/*/Makefile.am: move generic parts to inc file

Message ID 1407406499-11658-2-git-send-email-anders.roxell@linaro.org
State Accepted
Commit 02530f8ac36f6b7271013b3437ba20cd9806d18b
Headers show

Commit Message

Anders Roxell Aug. 7, 2014, 10:14 a.m. UTC 
Signed-off-by: Anders Roxell <anders.roxell@linaro.org>
---
 platform/Makefile.inc                | 11 +++++++++++
 platform/linux-dpdk/Makefile.am      | 11 +----------
 platform/linux-generic/Makefile.am   | 11 +----------
 platform/linux-keystone2/Makefile.am | 11 +----------
 4 files changed, 14 insertions(+), 30 deletions(-)
 create mode 100644 platform/Makefile.inc

Comments

Taras Kondratiuk Aug. 7, 2014, 10:34 a.m. UTC | #1 
On 08/07/2014 01:14 PM, Anders Roxell wrote:
> Signed-off-by: Anders Roxell <anders.roxell@linaro.org>
> ---
>   platform/Makefile.inc                | 11 +++++++++++
>   platform/linux-dpdk/Makefile.am      | 11 +----------
>   platform/linux-generic/Makefile.am   | 11 +----------
>   platform/linux-keystone2/Makefile.am | 11 +----------
>   4 files changed, 14 insertions(+), 30 deletions(-)
>   create mode 100644 platform/Makefile.inc

Acked-by: Taras Kondratiuk <taras.kondratiuk@linaro.org>
Maxim Uvarov Aug. 11, 2014, 11:25 a.m. UTC | #2 
Merged, thanks!

Maxim.
On 08/07/2014 02:14 PM, Anders Roxell wrote:
> Signed-off-by: Anders Roxell <anders.roxell@linaro.org>
> ---
>   platform/Makefile.inc                | 11 +++++++++++
>   platform/linux-dpdk/Makefile.am      | 11 +----------
>   platform/linux-generic/Makefile.am   | 11 +----------
>   platform/linux-keystone2/Makefile.am | 11 +----------
>   4 files changed, 14 insertions(+), 30 deletions(-)
>   create mode 100644 platform/Makefile.inc
>
> diff --git a/platform/Makefile.inc b/platform/Makefile.inc
> new file mode 100644
> index 0000000..6ffa2ad
> --- /dev/null
> +++ b/platform/Makefile.inc
> @@ -0,0 +1,11 @@
> +LIB   = $(top_builddir)/lib
> +
> +dist_pkgdata_DATA = $(LIB)/libodp.la
> +
> +pkgconfigdir = $(libdir)/pkgconfig
> +pkgconfig_DATA = $(top_builddir)/pkgconfig/libodp.pc
> +
> +.PHONY: pkgconfig/libodp.pc
> +
> +VPATH = $(srcdir) $(builddir)
> +lib_LTLIBRARIES = $(LIB)/libodp.la
> diff --git a/platform/linux-dpdk/Makefile.am b/platform/linux-dpdk/Makefile.am
> index 37150f2..fb87d41 100644
> --- a/platform/linux-dpdk/Makefile.am
> +++ b/platform/linux-dpdk/Makefile.am
> @@ -1,12 +1,5 @@
>   include $(top_srcdir)/Makefile.inc
> -LIB   = $(top_builddir)/lib
> -
> -dist_pkgdata_DATA = $(LIB)/libodp.la
> -
> -pkgconfigdir = $(libdir)/pkgconfig
> -pkgconfig_DATA = $(top_builddir)/pkgconfig/libodp.pc
> -
> -.PHONY: pkgconfig/libodp.pc
> +include $(top_srcdir)/platform/Makefile.inc
>   
>   PLAT_CFLAGS  = -msse4.2
>   if SDK_INSTALL_PATH_
> @@ -25,8 +18,6 @@ AM_CFLAGS +=  -I$(top_srcdir)/platform/linux-generic/include
>   AM_CFLAGS +=  -I$(top_srcdir)/platform/linux-generic/include/api
>   AM_CFLAGS +=  -I$(top_srcdir)/include
>   
> -VPATH = $(srcdir) $(builddir)
> -lib_LTLIBRARIES = $(LIB)/libodp.la
>   DPDK_LIBS="-lintel_dpdk -ldl"
>   LIBS += $(DPDK_LIBS)
>   
> diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am
> index 91a208a..41458d8 100644
> --- a/platform/linux-generic/Makefile.am
> +++ b/platform/linux-generic/Makefile.am
> @@ -1,18 +1,9 @@
>   include $(top_srcdir)/Makefile.inc
> -LIB   = $(top_builddir)/lib
> -
> -dist_pkgdata_DATA = $(LIB)/libodp.la
> -
> -pkgconfigdir = $(libdir)/pkgconfig
> -pkgconfig_DATA = $(top_builddir)/pkgconfig/libodp.pc
> -
> -.PHONY: pkgconfig/libodp.pc
> +include $(top_srcdir)/platform/Makefile.inc
>   
>   AM_CFLAGS +=  -I$(srcdir)/include
>   AM_CFLAGS +=  -I$(srcdir)/include/api
>   AM_CFLAGS +=  -I$(top_srcdir)/include
> -VPATH = $(srcdir) $(builddir)
> -lib_LTLIBRARIES = $(LIB)/libodp.la
>   
>   include_HEADERS = \
>   		  $(top_srcdir)/include/odp.h \
> diff --git a/platform/linux-keystone2/Makefile.am b/platform/linux-keystone2/Makefile.am
> index 3d48b54..b32c539 100644
> --- a/platform/linux-keystone2/Makefile.am
> +++ b/platform/linux-keystone2/Makefile.am
> @@ -1,12 +1,5 @@
>   include $(top_srcdir)/Makefile.inc
> -LIB   = $(top_builddir)/lib
> -
> -dist_pkgdata_DATA = $(LIB)/libodp.la
> -
> -pkgconfigdir = $(libdir)/pkgconfig
> -pkgconfig_DATA = $(top_builddir)/pkgconfig/libodp.pc
> -
> -.PHONY: pkgconfig/libodp.pc
> +include $(top_srcdir)/platform/Makefile.inc
>   
>   KS2_PLATFORM  = DEVICE_K2K
>   if SDK_INSTALL_PATH_
> @@ -28,8 +21,6 @@ AM_CFLAGS +=  -I$(srcdir)/include/api
>   AM_CFLAGS +=  -I$(top_srcdir)/platform/linux-generic/include
>   AM_CFLAGS +=  -I$(top_srcdir)/platform/linux-generic/include/api
>   AM_CFLAGS +=  -I$(top_srcdir)/include
> -VPATH = $(srcdir) $(builddir)
> -lib_LTLIBRARIES = $(LIB)/libodp.la
>   KS2_LIBS="-lopenem_rh -lopenem_osal"
>   LIBS += $(KS2_LIBS)
>
diff mbox

Patch

diff --git a/platform/Makefile.inc b/platform/Makefile.inc
new file mode 100644
index 0000000..6ffa2ad
--- /dev/null
+++ b/platform/Makefile.inc
@@ -0,0 +1,11 @@ 
+LIB   = $(top_builddir)/lib
+
+dist_pkgdata_DATA = $(LIB)/libodp.la
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = $(top_builddir)/pkgconfig/libodp.pc
+
+.PHONY: pkgconfig/libodp.pc
+
+VPATH = $(srcdir) $(builddir)
+lib_LTLIBRARIES = $(LIB)/libodp.la
diff --git a/platform/linux-dpdk/Makefile.am b/platform/linux-dpdk/Makefile.am
index 37150f2..fb87d41 100644
--- a/platform/linux-dpdk/Makefile.am
+++ b/platform/linux-dpdk/Makefile.am
@@ -1,12 +1,5 @@ 
 include $(top_srcdir)/Makefile.inc
-LIB   = $(top_builddir)/lib
-
-dist_pkgdata_DATA = $(LIB)/libodp.la
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = $(top_builddir)/pkgconfig/libodp.pc
-
-.PHONY: pkgconfig/libodp.pc
+include $(top_srcdir)/platform/Makefile.inc
 
 PLAT_CFLAGS  = -msse4.2
 if SDK_INSTALL_PATH_
@@ -25,8 +18,6 @@  AM_CFLAGS +=  -I$(top_srcdir)/platform/linux-generic/include
 AM_CFLAGS +=  -I$(top_srcdir)/platform/linux-generic/include/api
 AM_CFLAGS +=  -I$(top_srcdir)/include
 
-VPATH = $(srcdir) $(builddir)
-lib_LTLIBRARIES = $(LIB)/libodp.la
 DPDK_LIBS="-lintel_dpdk -ldl"
 LIBS += $(DPDK_LIBS)
 
diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am
index 91a208a..41458d8 100644
--- a/platform/linux-generic/Makefile.am
+++ b/platform/linux-generic/Makefile.am
@@ -1,18 +1,9 @@ 
 include $(top_srcdir)/Makefile.inc
-LIB   = $(top_builddir)/lib
-
-dist_pkgdata_DATA = $(LIB)/libodp.la
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = $(top_builddir)/pkgconfig/libodp.pc
-
-.PHONY: pkgconfig/libodp.pc
+include $(top_srcdir)/platform/Makefile.inc
 
 AM_CFLAGS +=  -I$(srcdir)/include
 AM_CFLAGS +=  -I$(srcdir)/include/api
 AM_CFLAGS +=  -I$(top_srcdir)/include
-VPATH = $(srcdir) $(builddir)
-lib_LTLIBRARIES = $(LIB)/libodp.la
 
 include_HEADERS = \
 		  $(top_srcdir)/include/odp.h \
diff --git a/platform/linux-keystone2/Makefile.am b/platform/linux-keystone2/Makefile.am
index 3d48b54..b32c539 100644
--- a/platform/linux-keystone2/Makefile.am
+++ b/platform/linux-keystone2/Makefile.am
@@ -1,12 +1,5 @@ 
 include $(top_srcdir)/Makefile.inc
-LIB   = $(top_builddir)/lib
-
-dist_pkgdata_DATA = $(LIB)/libodp.la
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = $(top_builddir)/pkgconfig/libodp.pc
-
-.PHONY: pkgconfig/libodp.pc
+include $(top_srcdir)/platform/Makefile.inc
 
 KS2_PLATFORM  = DEVICE_K2K
 if SDK_INSTALL_PATH_
@@ -28,8 +21,6 @@  AM_CFLAGS +=  -I$(srcdir)/include/api
 AM_CFLAGS +=  -I$(top_srcdir)/platform/linux-generic/include
 AM_CFLAGS +=  -I$(top_srcdir)/platform/linux-generic/include/api
 AM_CFLAGS +=  -I$(top_srcdir)/include
-VPATH = $(srcdir) $(builddir)
-lib_LTLIBRARIES = $(LIB)/libodp.la
 KS2_LIBS="-lopenem_rh -lopenem_osal"
 LIBS += $(KS2_LIBS)