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>
Acked-by: Andrew Rybchenko <andrew.rybche...@oktetlabs.ru>
---
drivers/common/sfc_efx/base/meson.build | 18 +++---------------
drivers/common/sfc_efx/meson.build | 3 ---
2 files changed, 3 insertions(+), 18 deletions(-)
diff --git a/drivers/common/sfc_efx/base/meson.build
b/drivers/common/sfc_efx/base/meson.build
index c8deb4555e..58bb5f7b4a 100644
--- a/drivers/common/sfc_efx/base/meson.build
+++ b/drivers/common/sfc_efx/base/meson.build
@@ -5,7 +5,7 @@
# This software was jointly developed between OKTET Labs (under contract
# for Solarflare) and Solarflare Communications, Inc.
-sources = [
+base_sources = files(
'efx_bootcfg.c',
'efx_crc32.c',
'efx_ev.c',
@@ -64,7 +64,7 @@ sources = [
'rhead_tunnel.c',
'rhead_tx.c',
'rhead_virtio.c',
-]
+)
if is_ms_compiler
extra_flags = [
@@ -80,20 +80,8 @@ else
]
endif
-c_args = cflags
foreach flag: extra_flags
if cc.has_argument(flag)
- c_args += flag
+ base_cflags += flag
endif
endforeach
-
-if build
- base_lib = static_library('sfc_base', sources,
- include_directories: includes,
- dependencies: static_rte_eal,
- c_args: c_args)
-
- base_objs = base_lib.extract_all_objects(recursive: true)
-else
- base_objs = []
-endif
diff --git a/drivers/common/sfc_efx/meson.build
b/drivers/common/sfc_efx/meson.build
index 0cf0a23bf8..d8cb6d7b96 100644
--- a/drivers/common/sfc_efx/meson.build
+++ b/drivers/common/sfc_efx/meson.build
@@ -35,12 +35,9 @@ foreach flag: extra_flags
endforeach
subdir('base')
-objs = [base_objs]
deps += ['bus_pci']
sources = files(
'sfc_efx.c',
'sfc_efx_mcdi.c',
)
-
-includes += include_directories('base')
--
2.45.2
