Use the base code build handling logic in the drivers/meson.build file,
rather than re-implementing it in the driver itself.
Signed-off-by: Bruce Richardson <bruce.richard...@intel.com>
---
drivers/net/octeontx/base/meson.build | 19 +------------------
drivers/net/octeontx/meson.build | 3 ---
2 files changed, 1 insertion(+), 21 deletions(-)
diff --git a/drivers/net/octeontx/base/meson.build
b/drivers/net/octeontx/base/meson.build
index 8e5e8c1b55..244466bd36 100644
--- a/drivers/net/octeontx/base/meson.build
+++ b/drivers/net/octeontx/base/meson.build
@@ -1,25 +1,8 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2017 Cavium, Inc
-sources = [
+base_sources = files(
'octeontx_pkovf.c',
'octeontx_pkivf.c',
'octeontx_bgx.c',
-]
-
-depends = ['ethdev', 'mempool_octeontx']
-static_objs = []
-foreach d: depends
- if not is_variable('shared_rte_' + d)
- subdir_done()
- endif
- static_objs += get_variable('static_rte_' + d)
-endforeach
-
-c_args = cflags
-base_lib = static_library('octeontx_base', sources,
- c_args: c_args,
- dependencies: static_objs,
)
-
-base_objs = base_lib.extract_all_objects(recursive: true)
diff --git a/drivers/net/octeontx/meson.build b/drivers/net/octeontx/meson.build
index 541d2d9d0b..fc8a5a73f2 100644
--- a/drivers/net/octeontx/meson.build
+++ b/drivers/net/octeontx/meson.build
@@ -8,7 +8,6 @@ if not is_linux or not dpdk_conf.get('RTE_ARCH_64')
endif
subdir('base')
-objs = [base_objs]
sources = files(
'octeontx_ethdev.c',
@@ -18,6 +17,4 @@ sources = files(
deps += ['mempool_octeontx', 'eventdev']
-includes += include_directories('base')
-
cflags += no_wvla_cflag
--
2.45.2
