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/txgbe/base/meson.build | 18 ++---------------- drivers/net/txgbe/meson.build | 3 --- 2 files changed, 2 insertions(+), 19 deletions(-) diff --git a/drivers/net/txgbe/base/meson.build b/drivers/net/txgbe/base/meson.build index 4cf90a394a..0bb0782c92 100644 --- a/drivers/net/txgbe/base/meson.build +++ b/drivers/net/txgbe/base/meson.build @@ -1,7 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2015-2020 Beijing WangXun Technology Co., Ltd. -sources = [ +base_sources = files( 'txgbe_dcb_hw.c', 'txgbe_dcb.c', 'txgbe_eeprom.c', @@ -10,18 +10,4 @@ sources = [ 'txgbe_mng.c', 'txgbe_phy.c', 'txgbe_vf.c', -] - -error_cflags = [] - -c_args = cflags -foreach flag: error_cflags - if cc.has_argument(flag) - c_args += flag - endif -endforeach - -base_lib = static_library('txgbe_base', sources, - dependencies: [static_rte_eal, static_rte_net, static_rte_bus_pci], - c_args: c_args) -base_objs = base_lib.extract_all_objects(recursive: true) +) diff --git a/drivers/net/txgbe/meson.build b/drivers/net/txgbe/meson.build index d9ca3743e2..4dbbf597bb 100644 --- a/drivers/net/txgbe/meson.build +++ b/drivers/net/txgbe/meson.build @@ -8,7 +8,6 @@ if is_windows endif subdir('base') -objs = [base_objs] sources = files( 'txgbe_ethdev.c', @@ -32,6 +31,4 @@ elif arch_subdir == 'arm' sources += files('txgbe_rxtx_vec_neon.c') endif -includes += include_directories('base') - install_headers('rte_pmd_txgbe.h') -- 2.45.2