The enabled_libs variable is renamed and moved to the top level
meson.build file, for sake of consistency wrt to drivers and
applications similar variables.
Signed-off-by: David Marchand <david.march...@redhat.com>
---
app/test/meson.build | 2 +-
buildtools/chkincs/meson.build | 2 +-
lib/meson.build | 4 +---
meson.build | 3 ++-
4 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/app/test/meson.build b/app/test/meson.build
index d0fabcbb8b..f3217ae577 100644
--- a/app/test/meson.build
+++ b/app/test/meson.build
@@ -152,7 +152,7 @@ test_sources = files(
'virtual_pmd.c',
)
-test_deps = enabled_libs
+test_deps = dpdk_libs_enabled
# as well as libs, the pci and vdev bus drivers are needed for a lot of tests
test_deps += ['bus_pci', 'bus_vdev']
diff --git a/buildtools/chkincs/meson.build b/buildtools/chkincs/meson.build
index 378c2f19ef..f2dadcae18 100644
--- a/buildtools/chkincs/meson.build
+++ b/buildtools/chkincs/meson.build
@@ -22,7 +22,7 @@ sources += gen_c_files.process(dpdk_chkinc_headers)
# so we always include them in deps list
deps = [get_variable('shared_rte_bus_vdev'),
get_variable('shared_rte_bus_pci')]
# add the rest of the libs to the dependencies
-foreach l:enabled_libs
+foreach l:dpdk_libs_enabled
deps += get_variable('shared_rte_' + l)
endforeach
diff --git a/lib/meson.build b/lib/meson.build
index f5c8a70a1d..363a4fd79f 100644
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -112,8 +112,6 @@ if cc.has_argument('-Wno-format-truncation')
default_cflags += '-Wno-format-truncation'
endif
-enabled_libs = [] # used to print summary at the end
-
foreach l:libraries
build = true
reason = '<unknown reason>' # set if build == false to explain why
@@ -180,7 +178,7 @@ foreach l:libraries
continue
endif
- enabled_libs += name
+ dpdk_libs_enabled += name
dpdk_conf.set('RTE_LIB_' + name.to_upper(), 1)
install_headers(headers)
install_headers(indirect_headers)
diff --git a/meson.build b/meson.build
index 992ca91e88..39cb73846d 100644
--- a/meson.build
+++ b/meson.build
@@ -44,6 +44,7 @@ dpdk_extra_ldflags = []
dpdk_libs_deprecated = []
dpdk_apps_disabled = []
dpdk_libs_disabled = []
+dpdk_libs_enabled = []
dpdk_drvs_disabled = []
testpmd_drivers_sources = []
testpmd_drivers_deps = []
@@ -134,7 +135,7 @@ message(output_message + '\n')
output_message = '\n=================\nLibraries Enabled\n=================\n'
output_message += '\nlibs:\n\t'
output_count = 0
-foreach lib:enabled_libs
+foreach lib:dpdk_libs_enabled
output_message += lib + ', '
output_count += 1
if output_count == 8
--
2.40.1
