From: Bruce Richardson <bruce.richardson@intel.com>
Date: Fri, 8 Jun 2018 21:20:46 +0000 (+0100)
Subject: net/softnic: add to meson build
X-Git-Url: http://git.droids-corp.org/?a=commitdiff_plain;h=6b2a3900e2fb;p=dpdk.git

net/softnic: add to meson build

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>
---

diff --git a/drivers/net/meson.build b/drivers/net/meson.build
index b1c1bbab9a..55da78574a 100644
--- a/drivers/net/meson.build
+++ b/drivers/net/meson.build
@@ -21,7 +21,9 @@ drivers = ['af_packet',
 	'mvpp2',
 	'nfp',
 	'null', 'octeontx', 'pcap', 'ring',
-	'sfc', 'thunderx', 'virtio']
+	'sfc',
+	'softnic',
+	'thunderx', 'virtio']
 std_deps = ['ethdev', 'kvargs'] # 'ethdev' also pulls in mbuf, net, eal etc
 std_deps += ['bus_pci']         # very many PMDs depend on PCI, so make std
 std_deps += ['bus_vdev']        # same with vdev bus
diff --git a/drivers/net/softnic/Makefile b/drivers/net/softnic/Makefile
index d56fecd62d..97ac88411d 100644
--- a/drivers/net/softnic/Makefile
+++ b/drivers/net/softnic/Makefile
@@ -14,7 +14,7 @@ LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring
 LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -lrte_sched
 LDLIBS += -lrte_bus_vdev
 
-EXPORT_MAP := rte_pmd_eth_softnic_version.map
+EXPORT_MAP := rte_pmd_softnic_version.map
 
 LIBABIVER := 1
 
diff --git a/drivers/net/softnic/meson.build b/drivers/net/softnic/meson.build
new file mode 100644
index 0000000000..41059da8b6
--- /dev/null
+++ b/drivers/net/softnic/meson.build
@@ -0,0 +1,7 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2018 Intel Corporation
+
+install_headers('rte_eth_softnic.h')
+sources = files('rte_eth_softnic_tm.c',
+	'rte_eth_softnic.c')
+deps += 'sched'
diff --git a/drivers/net/softnic/rte_pmd_eth_softnic_version.map b/drivers/net/softnic/rte_pmd_eth_softnic_version.map
deleted file mode 100644
index fb2cb68ca4..0000000000
--- a/drivers/net/softnic/rte_pmd_eth_softnic_version.map
+++ /dev/null
@@ -1,7 +0,0 @@
-DPDK_17.11 {
-	global:
-
-	rte_pmd_softnic_run;
-
-	local: *;
-};
diff --git a/drivers/net/softnic/rte_pmd_softnic_version.map b/drivers/net/softnic/rte_pmd_softnic_version.map
new file mode 100644
index 0000000000..fb2cb68ca4
--- /dev/null
+++ b/drivers/net/softnic/rte_pmd_softnic_version.map
@@ -0,0 +1,7 @@
+DPDK_17.11 {
+	global:
+
+	rte_pmd_softnic_run;
+
+	local: *;
+};