From mboxrd@z Thu Jan  1 00:00:00 1970
From: Luca Boccassi <bluca@debian.org>
Subject: [PATCH 11/15] net/sfc: rename version map after library
	file name
Date: Mon, 10 Sep 2018 21:04:11 +0100
Message-ID: <20180910200415.8340-12-bluca@debian.org>
References: <20180910200415.8340-1-bluca@debian.org>
Cc: keith.wiles@intel.com, roy.fan.zhang@intel.com, jingjing.wu@intel.com,
 wenzhuo.lu@intel.com, rasesh.mody@cavium.com, harish.patil@cavium.com,
 shahed.shaikh@cavium.com, amr.mokhtar@intel.com,
 shijith.thotton@cavium.com, ssrinivasan@cavium.com, liang.j.ma@intel.com,
 peter.mccarthy@intel.com, jerin.jacob@caviumnetworks.com,
 maciej.czekaj@caviumnetworks.com, arybchenko@solarflare.com,
 antosh.shukla@caviumnetworks.com, ashish.gupta@cavium.com,
 yongwang@vmware.com, bruce.richardson@intel.com, thomas@monjalon.net
To: dev@dpdk.org
Return-path: <dev-bounces@dpdk.org>
Received: from mail-wm0-f68.google.com (mail-wm0-f68.google.com [74.125.82.68])
 by dpdk.org (Postfix) with ESMTP id 0B2D55F1C
 for <dev@dpdk.org>; Mon, 10 Sep 2018 22:04:58 +0200 (CEST)
Received: by mail-wm0-f68.google.com with SMTP id f21-v6so22795360wmc.5
 for <dev@dpdk.org>; Mon, 10 Sep 2018 13:04:58 -0700 (PDT)
In-Reply-To: <20180910200415.8340-1-bluca@debian.org>
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
 <mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
 <mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Sender: "dev" <dev-bounces@dpdk.org>

The library is called librte_pmd_sfc_efx, so rename the map file
and set the name in the meson file so that the built library names with
meson and legacy makefiles are the same

Fixes: bfa8d5990cd6 ("net/sfc: support meson build")
Cc: stable@dpdk.org

Signed-off-by: Luca Boccassi <bluca@debian.org>
---
 drivers/net/sfc/Makefile                                        | 2 +-
 drivers/net/sfc/meson.build                                     | 2 ++
 .../{rte_pmd_sfc_version.map => rte_pmd_sfc_efx_version.map}    | 0
 3 files changed, 3 insertions(+), 1 deletion(-)
 rename drivers/net/sfc/{rte_pmd_sfc_version.map => rte_pmd_sfc_efx_version.map} (100%)

diff --git a/drivers/net/sfc/Makefile b/drivers/net/sfc/Makefile
index 3bb41a0001..2825649599 100644
--- a/drivers/net/sfc/Makefile
+++ b/drivers/net/sfc/Makefile
@@ -60,7 +60,7 @@ BASE_DRIVER_OBJS=$(sort $(patsubst %.c,%.o,$(notdir $(wildcard $(SRCDIR)/base/*.
 $(foreach obj, $(BASE_DRIVER_OBJS), \
   $(eval CFLAGS_$(obj)+=$(CFLAGS_BASE_DRIVER)))
 
-EXPORT_MAP := rte_pmd_sfc_version.map
+EXPORT_MAP := rte_pmd_sfc_efx_version.map
 
 LIBABIVER := 1
 
diff --git a/drivers/net/sfc/meson.build b/drivers/net/sfc/meson.build
index 2d34e869d8..d6572b82c0 100644
--- a/drivers/net/sfc/meson.build
+++ b/drivers/net/sfc/meson.build
@@ -6,6 +6,8 @@
 # This software was jointly developed between OKTET Labs (under contract
 # for Solarflare) and Solarflare Communications, Inc.
 
+name = 'sfc_efx'
+
 if arch_subdir != 'x86' or cc.sizeof('void *') == 4
 	build = false
 endif
diff --git a/drivers/net/sfc/rte_pmd_sfc_version.map b/drivers/net/sfc/rte_pmd_sfc_efx_version.map
similarity index 100%
rename from drivers/net/sfc/rte_pmd_sfc_version.map
rename to drivers/net/sfc/rte_pmd_sfc_efx_version.map
-- 
2.18.0