[dpdk-dev,v3] mk: Link test app against librte_pmd_ring when needed

Message ID 1422521516-780-4-git-send-email-tomaszx.kulasek@intel.com (mailing list archive)
State Superseded, archived
Headers

Commit Message

Tomasz Kulasek Jan. 29, 2015, 8:51 a.m. UTC
  This patch links test application against librte_pmd_ring.so for shared 
libraries. It's required as long as librte_pmd_ring provides some aditional
routines used for configuration and testing purposes and must be 
"hard-linked".

Signed-off-by: Tomasz Kulasek <tomaszx.kulasek@intel.com>
---
 app/test/Makefile |   15 +++++++++++++++
 1 file changed, 15 insertions(+)
  

Comments

Doherty, Declan Feb. 12, 2015, 11:50 a.m. UTC | #1
On 29/01/15 08:51, Tomasz Kulasek wrote:
> This patch links test application against librte_pmd_ring.so for shared
> libraries. It's required as long as librte_pmd_ring provides some aditional
> routines used for configuration and testing purposes and must be
> "hard-linked".
>
> Signed-off-by: Tomasz Kulasek <tomaszx.kulasek@intel.com>
> ---
>   app/test/Makefile |   15 +++++++++++++++
>   1 file changed, 15 insertions(+)
>
> diff --git a/app/test/Makefile b/app/test/Makefile
> index ee0e95a..04e6396 100644
> --- a/app/test/Makefile
> +++ b/app/test/Makefile
> @@ -128,8 +128,12 @@ SRCS-y += test_devargs.c
>   SRCS-y += virtual_pmd.c
>   SRCS-y += packet_burst_generator.c
>   SRCS-$(CONFIG_RTE_LIBRTE_ACL) += test_acl.c
> +
> +ifeq ($(CONFIG_RTE_LIBRTE_PMD_RING),y)
>   SRCS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += test_link_bonding.c
>   SRCS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += test_link_bonding_mode4.c
> +endif
> +
>   SRCS-$(CONFIG_RTE_LIBRTE_PMD_RING) += test_pmd_ring.c
>   SRCS-$(CONFIG_RTE_LIBRTE_KVARGS) += test_kvargs.c
>
> @@ -147,6 +151,17 @@ CFLAGS += -D_GNU_SOURCE
>   # this application needs libraries first
>   DEPDIRS-y += lib
>
> +# Link against shared libraries when needed
> +ifeq ($(CONFIG_RTE_LIBRTE_PMD_BOND),y)
> +ifneq ($(CONFIG_RTE_LIBRTE_PMD_RING),y)
> +$(error Link bonding tests require CONFIG_RTE_LIBRTE_PMD_RING=y)
> +else
> +ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y)
> +LDLIBS += -lrte_pmd_ring
> +endif
> +endif
> +endif
> +
>   include $(RTE_SDK)/mk/rte.app.mk
>
>   endif
>

Hey Tomasz, there's a whitespace error when applying this patch

Declan
  

Patch

diff --git a/app/test/Makefile b/app/test/Makefile
index ee0e95a..04e6396 100644
--- a/app/test/Makefile
+++ b/app/test/Makefile
@@ -128,8 +128,12 @@  SRCS-y += test_devargs.c
 SRCS-y += virtual_pmd.c
 SRCS-y += packet_burst_generator.c
 SRCS-$(CONFIG_RTE_LIBRTE_ACL) += test_acl.c
+
+ifeq ($(CONFIG_RTE_LIBRTE_PMD_RING),y)
 SRCS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += test_link_bonding.c
 SRCS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += test_link_bonding_mode4.c
+endif
+
 SRCS-$(CONFIG_RTE_LIBRTE_PMD_RING) += test_pmd_ring.c
 SRCS-$(CONFIG_RTE_LIBRTE_KVARGS) += test_kvargs.c
 
@@ -147,6 +151,17 @@  CFLAGS += -D_GNU_SOURCE
 # this application needs libraries first
 DEPDIRS-y += lib
 
+# Link against shared libraries when needed
+ifeq ($(CONFIG_RTE_LIBRTE_PMD_BOND),y)
+ifneq ($(CONFIG_RTE_LIBRTE_PMD_RING),y)
+$(error Link bonding tests require CONFIG_RTE_LIBRTE_PMD_RING=y)
+else 
+ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y)
+LDLIBS += -lrte_pmd_ring
+endif
+endif
+endif
+
 include $(RTE_SDK)/mk/rte.app.mk
 
 endif