build: fix formatting of Meson lists

Running "./devtools/check-meson.py --fix" on the DPDK repo fixes a
number of issues with whitespace and formatting of files:

* indentation of lists
* missing trailing commas on final list element
* multiple list entries per line when list is not all single-line

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>

diff --git a/app/test-eventdev/meson.build b/app/test-eventdev/meson.build
index 04117dbe4f60a356ffb9872e28a08bb611dc1b63..45c3ff4566380163efc09a4bb544ea46a581623d 100644 (file)
--- a/app/test-eventdev/meson.build
+++ b/app/test-eventdev/meson.build
@@ -14,6 +14,6 @@ sources = files(
         'test_perf_queue.c',
         'test_pipeline_atq.c',
         'test_pipeline_common.c',
-        'test_pipeline_queue.c'
+        'test_pipeline_queue.c',
 )
 deps += 'eventdev'

diff --git a/config/x86/meson.build b/config/x86/meson.build
index 34b11648101891566a2a2e8fc4fadbbabe08de56..b9348c44dea7067c49aeb584d0f048e7d26d09cd 100644 (file)
--- a/config/x86/meson.build
+++ b/config/x86/meson.build
@@ -22,18 +22,18 @@ foreach f:base_flags
 endforeach
 
 optional_flags = [
-    'AES',
-    'AVX',
-    'AVX2',
-    'AVX512BW',
-    'AVX512CD',
-    'AVX512DQ',
-    'AVX512F',
-    'AVX512VL',
-    'PCLMUL',
-    'RDRND',
-    'RDSEED',
-    'VPCLMULQDQ',
+        'AES',
+        'AVX',
+        'AVX2',
+        'AVX512BW',
+        'AVX512CD',
+        'AVX512DQ',
+        'AVX512F',
+        'AVX512VL',
+        'PCLMUL',
+        'RDRND',
+        'RDSEED',
+        'VPCLMULQDQ',
 ]
 foreach f:optional_flags
     if cc.get_define('__@0@__'.format(f), args: machine_args) == '1'

diff --git a/drivers/bus/fslmc/meson.build b/drivers/bus/fslmc/meson.build
index e99218ca73b770124ea11abe85939cfbdde1ca34..54be76f516b42f0ff6c43c29514db98ea9f386ae 100644 (file)
--- a/drivers/bus/fslmc/meson.build
+++ b/drivers/bus/fslmc/meson.build
@@ -21,7 +21,7 @@ sources = files(
         'portal/dpaa2_hw_dpci.c',
         'portal/dpaa2_hw_dpio.c',
         'qbman/qbman_portal.c',
-        'qbman/qbman_debug.c'
+        'qbman/qbman_debug.c',
 )
 
 includes += include_directories('mc', 'qbman/include', 'portal')

diff --git a/drivers/common/mlx5/meson.build b/drivers/common/mlx5/meson.build
index b5585d2cc3ea6bcffd4d0db80cf86e2a102c6689..e78b4f47bc0d847e4f8fb769ba9cc4a6d0e5aa8a 100644 (file)
--- a/drivers/common/mlx5/meson.build
+++ b/drivers/common/mlx5/meson.build
@@ -23,7 +23,7 @@ cflags_options = [
         '-Wno-strict-prototypes',
         '-D_BSD_SOURCE',
         '-D_DEFAULT_SOURCE',
-        '-D_XOPEN_SOURCE=600'
+        '-D_XOPEN_SOURCE=600',
 ]
 foreach option:cflags_options
     if cc.has_argument(option)

diff --git a/drivers/common/sfc_efx/base/meson.build b/drivers/common/sfc_efx/base/meson.build
index 313e53d77a8e5ac0ccf969579c772c969e966084..9fba47b1cc1785210035008d8322cfcb6b695364 100644 (file)
--- a/drivers/common/sfc_efx/base/meson.build
+++ b/drivers/common/sfc_efx/base/meson.build
@@ -70,7 +70,7 @@ extra_flags = [
         '-Wno-unused-parameter',
         '-Wno-unused-variable',
         '-Wno-empty-body',
-        '-Wno-unused-but-set-variable'
+        '-Wno-unused-but-set-variable',
 ]
 
 c_args = cflags

diff --git a/drivers/common/sfc_efx/meson.build b/drivers/common/sfc_efx/meson.build
index d87ba396b4852d3355a3d3391691cd15b0813c34..f42ccf609cb6fa00c93cee048f5179bcd2fdf9f6 100644 (file)
--- a/drivers/common/sfc_efx/meson.build
+++ b/drivers/common/sfc_efx/meson.build
@@ -19,13 +19,13 @@ extra_flags = []
 
 # Enable more warnings
 extra_flags += [
-        '-Wdisabled-optimization'
+        '-Wdisabled-optimization',
 ]
 
 # Compiler and version dependent flags
 extra_flags += [
         '-Waggregate-return',
-        '-Wbad-function-cast'
+        '-Wbad-function-cast',
 ]
 
 foreach flag: extra_flags

diff --git a/drivers/compress/mlx5/meson.build b/drivers/compress/mlx5/meson.build
index c5c5edfa7d9bf450888396610d298b56d092ac3f..7aac32998600cc2ea8409d02ed7a5409cd2451eb 100644 (file)
--- a/drivers/compress/mlx5/meson.build
+++ b/drivers/compress/mlx5/meson.build
@@ -17,7 +17,7 @@ cflags_options = [
         '-Wno-strict-prototypes',
         '-D_BSD_SOURCE',
         '-D_DEFAULT_SOURCE',
-        '-D_XOPEN_SOURCE=600'
+        '-D_XOPEN_SOURCE=600',
 ]
 foreach option:cflags_options
     if cc.has_argument(option)

diff --git a/drivers/crypto/bcmfs/meson.build b/drivers/crypto/bcmfs/meson.build
index 0388ba19a46ae651113a7d19966030f7dcad6835..d67e78d51bf08987384dbd83d8d47f8fedf79e1a 100644 (file)
--- a/drivers/crypto/bcmfs/meson.build
+++ b/drivers/crypto/bcmfs/meson.build
@@ -16,5 +16,5 @@ sources = files(
         'bcmfs_sym_capabilities.c',
         'bcmfs_sym_session.c',
         'bcmfs_sym.c',
-        'bcmfs_sym_engine.c'
+        'bcmfs_sym_engine.c',
 )

diff --git a/drivers/crypto/nitrox/meson.build b/drivers/crypto/nitrox/meson.build
index 2fdae03c16ebc1adcc5e99d0de67ee2e29a4d6a6..2cc47c46269d2363e565457e51e65862e90c2b6d 100644 (file)
--- a/drivers/crypto/nitrox/meson.build
+++ b/drivers/crypto/nitrox/meson.build
@@ -14,5 +14,5 @@ sources = files(
         'nitrox_sym.c',
         'nitrox_sym_capabilities.c',
         'nitrox_sym_reqmgr.c',
-        'nitrox_qp.c'
+        'nitrox_qp.c',
 )

diff --git a/drivers/crypto/qat/meson.build b/drivers/crypto/qat/meson.build
index 4da819d65a4c9dd9dfa683c79894d04475ada7cf..b3b2d172580993de4cf4dbc48380880990cc402b 100644 (file)
--- a/drivers/crypto/qat/meson.build
+++ b/drivers/crypto/qat/meson.build
@@ -17,7 +17,7 @@ if dep.found()
             'qat_asym_pmd.c',
             'qat_sym.c',
             'qat_sym_hw_dp.c',
-                       'qat_sym_pmd.c',
+            'qat_sym_pmd.c',
             'qat_sym_session.c',
        )
     qat_ext_deps += dep

diff --git a/drivers/net/e1000/base/meson.build b/drivers/net/e1000/base/meson.build
index 99468764e4a5a4cb7aad388e3afebd0d98ecbdae..317692dfab7d102983561699d202437f33a3099f 100644 (file)
--- a/drivers/net/e1000/base/meson.build
+++ b/drivers/net/e1000/base/meson.build
@@ -19,7 +19,7 @@ sources = [
         'e1000_nvm.c',
         'e1000_osdep.c',
         'e1000_phy.c',
-        'e1000_vf.c'
+        'e1000_vf.c',
 ]
 
 error_cflags = ['-Wno-uninitialized', '-Wno-unused-parameter',

diff --git a/drivers/net/fm10k/base/meson.build b/drivers/net/fm10k/base/meson.build
index 6467a1278dbed1e7616e452f385a895ea2112ba1..ca98d34d4e7658c2daef9391f9110644f2c0de20 100644 (file)
--- a/drivers/net/fm10k/base/meson.build
+++ b/drivers/net/fm10k/base/meson.build
@@ -7,7 +7,7 @@ sources = [
         'fm10k_mbx.c',
         'fm10k_pf.c',
         'fm10k_tlv.c',
-        'fm10k_vf.c'
+        'fm10k_vf.c',
 ]
 
 error_cflags = ['-Wno-unused-parameter', '-Wno-unused-value',

diff --git a/drivers/net/i40e/base/meson.build b/drivers/net/i40e/base/meson.build
index c319902cd881b9de57bbfbe7bac574b7ff2aded4..79a887a2976514e1020b9b0b779a2fbd0a688a08 100644 (file)
--- a/drivers/net/i40e/base/meson.build
+++ b/drivers/net/i40e/base/meson.build
@@ -8,7 +8,7 @@ sources = [
         'i40e_diag.c',
         'i40e_hmc.c',
         'i40e_lan_hmc.c',
-        'i40e_nvm.c'
+        'i40e_nvm.c',
 ]
 
 error_cflags = ['-Wno-sign-compare', '-Wno-unused-value',

diff --git a/drivers/net/ixgbe/base/meson.build b/drivers/net/ixgbe/base/meson.build
index 4d5e41bdeb714bc401a551f9b5c82ee13cc37bc6..7d3cec002d792502da66a68ab24bbefbfa3a35bb 100644 (file)
--- a/drivers/net/ixgbe/base/meson.build
+++ b/drivers/net/ixgbe/base/meson.build
@@ -14,7 +14,7 @@ sources = [
         'ixgbe_phy.c',
         'ixgbe_vf.c',
         'ixgbe_x540.c',
-        'ixgbe_x550.c'
+        'ixgbe_x550.c',
 ]
 
 error_cflags = ['-Wno-unused-value',

diff --git a/drivers/net/octeontx/base/meson.build b/drivers/net/octeontx/base/meson.build
index 0a69dfd467cca9565e7be03f29a6b1ef9f8254e9..c86a7267044640cbe43136179b5f5be0d8d11490 100644 (file)
--- a/drivers/net/octeontx/base/meson.build
+++ b/drivers/net/octeontx/base/meson.build
@@ -4,7 +4,7 @@
 sources = [
         'octeontx_pkovf.c',
         'octeontx_pkivf.c',
-        'octeontx_bgx.c'
+        'octeontx_bgx.c',
 ]
 
 depends = ['ethdev', 'mempool_octeontx']

diff --git a/drivers/net/sfc/meson.build b/drivers/net/sfc/meson.build
index b58425bf99828fb906a89b960f7795a6f781eeee..ccf5984d87fb8b7c2fc16166989d65acdc93c476 100644 (file)
--- a/drivers/net/sfc/meson.build
+++ b/drivers/net/sfc/meson.build
@@ -24,13 +24,13 @@ extra_flags += '-Wno-strict-aliasing'
 
 # Enable more warnings
 extra_flags += [
-        '-Wdisabled-optimization'
+        '-Wdisabled-optimization',
 ]
 
 # Compiler and version dependent flags
 extra_flags += [
         '-Waggregate-return',
-        '-Wbad-function-cast'
+        '-Wbad-function-cast',
 ]
 
 foreach flag: extra_flags

diff --git a/drivers/net/thunderx/base/meson.build b/drivers/net/thunderx/base/meson.build
index 9cf4bf553aec5c212e72385831ac9eaac8fd02fd..704ee65771110a4c2074fde299230f5e39b0a38d 100644 (file)
--- a/drivers/net/thunderx/base/meson.build
+++ b/drivers/net/thunderx/base/meson.build
@@ -4,7 +4,7 @@
 sources = [
         'nicvf_hw.c',
         'nicvf_mbox.c',
-        'nicvf_bsvf.c'
+        'nicvf_bsvf.c',
 ]
 
 c_args = cflags

diff --git a/drivers/raw/skeleton/meson.build b/drivers/raw/skeleton/meson.build
index b5d87652f55434f8ae2a6082e707871a1236f2a8..950a33cc200ff03e9111efeecf66419760da6d71 100644 (file)
--- a/drivers/raw/skeleton/meson.build
+++ b/drivers/raw/skeleton/meson.build
@@ -3,6 +3,6 @@
 
 deps += ['rawdev', 'kvargs', 'mbuf', 'bus_vdev']
 sources = files(
-               'skeleton_rawdev.c',
+        'skeleton_rawdev.c',
         'skeleton_rawdev_test.c',
 )

diff --git a/examples/l3fwd/meson.build b/examples/l3fwd/meson.build
index 773ebf4783291205d597df836e241d2b027f6948..0830b3eb31643c3f2564a55cf18fe18d64b7f989 100644 (file)
--- a/examples/l3fwd/meson.build
+++ b/examples/l3fwd/meson.build
@@ -9,11 +9,11 @@
 allow_experimental_apis = true
 deps += ['hash', 'lpm', 'fib', 'eventdev']
 sources = files(
-    'l3fwd_em.c',
-    'l3fwd_event.c',
-    'l3fwd_event_internal_port.c',
-    'l3fwd_event_generic.c',
-    'l3fwd_fib.c',
-    'l3fwd_lpm.c',
-    'main.c',
+        'l3fwd_em.c',
+        'l3fwd_event.c',
+        'l3fwd_event_internal_port.c',
+        'l3fwd_event_generic.c',
+        'l3fwd_fib.c',
+        'l3fwd_lpm.c',
+        'main.c',
 )

diff --git a/examples/multi_process/client_server_mp/mp_client/meson.build b/examples/multi_process/client_server_mp/mp_client/meson.build
index 3c4848bdefa0de21310b27d74d0c00d470ee5be9..c7190b212c92af14e8876666893f617c729bf297 100644 (file)
--- a/examples/multi_process/client_server_mp/mp_client/meson.build
+++ b/examples/multi_process/client_server_mp/mp_client/meson.build
@@ -10,5 +10,5 @@ includes += include_directories('../shared')
 
 allow_experimental_apis = true
 sources = files(
-        'client.c'
+        'client.c',
 )

diff --git a/examples/multi_process/client_server_mp/mp_server/meson.build b/examples/multi_process/client_server_mp/mp_server/meson.build
index 74814e5fe80c891820e55fe7e676134356c1e57d..9e585e80b9efabfa6992c196b57c480048fd1182 100644 (file)
--- a/examples/multi_process/client_server_mp/mp_server/meson.build
+++ b/examples/multi_process/client_server_mp/mp_server/meson.build
@@ -10,5 +10,7 @@ includes += include_directories('../shared')
 
 allow_experimental_apis = true
 sources = files(
-        'args.c', 'init.c', 'main.c'
+        'args.c',
+        'init.c',
+        'main.c',
 )

diff --git a/examples/multi_process/hotplug_mp/meson.build b/examples/multi_process/hotplug_mp/meson.build
index ae92905049f6e1387f3591de919ca62f115697a0..a1ad98ca2ef35dde7fb187dfd4bd1346979ce915 100644 (file)
--- a/examples/multi_process/hotplug_mp/meson.build
+++ b/examples/multi_process/hotplug_mp/meson.build
@@ -8,5 +8,6 @@
 
 allow_experimental_apis = true
 sources = files(
-        'commands.c', 'main.c'
+        'commands.c',
+        'main.c',
 )

diff --git a/examples/multi_process/simple_mp/meson.build b/examples/multi_process/simple_mp/meson.build
index adb06b0a75b45d32f1d2693b5f52ca17c0a1dad5..359af4384d37e036072bfb4b6d98dbc8c564237c 100644 (file)
--- a/examples/multi_process/simple_mp/meson.build
+++ b/examples/multi_process/simple_mp/meson.build
@@ -8,5 +8,6 @@
 
 allow_experimental_apis = true
 sources = files(
-        'mp_commands.c', 'main.c'
+        'mp_commands.c',
+        'main.c',
 )

diff --git a/examples/multi_process/symmetric_mp/meson.build b/examples/multi_process/symmetric_mp/meson.build
index a5b988c44f57724fae1ff0e6722812c02db513b3..e768a324d6812bc9522bd48e9b26c8d86ff84170 100644 (file)
--- a/examples/multi_process/symmetric_mp/meson.build
+++ b/examples/multi_process/symmetric_mp/meson.build
@@ -8,5 +8,5 @@
 
 allow_experimental_apis = true
 sources = files(
-        'main.c'
+        'main.c',
 )

diff --git a/lib/mbuf/meson.build b/lib/mbuf/meson.build
index c8c08220a0e9ce8b46daa0ab9521bb0cccad6483..0435c5e6280e7e222354f1e0593f2cc1b816d075 100644 (file)
--- a/lib/mbuf/meson.build
+++ b/lib/mbuf/meson.build
@@ -12,6 +12,6 @@ headers = files(
         'rte_mbuf_core.h',
         'rte_mbuf_ptype.h',
         'rte_mbuf_pool_ops.h',
-        'rte_mbuf_dyn.h'
+        'rte_mbuf_dyn.h',
 )
 deps += ['mempool']

diff --git a/lib/meson.build b/lib/meson.build
index c9a20f65b7af6e07d3f9c783366ea1a1589c9de7..64a59abab6446621fa1fe89d4f14f718707e3309 100644 (file)
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -82,9 +82,9 @@ if is_windows
 endif
 
 optional_libs = [
-    'kni',
-    'power',
-    'vhost',
+        'kni',
+        'power',
+        'vhost',
 ]
 
 disabled_libs = []

diff --git a/lib/power/meson.build b/lib/power/meson.build
index a2cc9fe2ef4e98e8a6ec0bff25c90195b9aaeb41..c1097d32f1eeb5ae98ccb0de6ccf4c9ec68c40bc 100644 (file)
--- a/lib/power/meson.build
+++ b/lib/power/meson.build
@@ -19,6 +19,6 @@ headers = files(
         'rte_power.h',
         'rte_power_empty_poll.h',
         'rte_power_pmd_mgmt.h',
-        'rte_power_guest_channel.h'
+        'rte_power_guest_channel.h',
 )
 deps += ['timer', 'ethdev']

diff --git a/lib/table/meson.build b/lib/table/meson.build
index 230f21ea8e1d5c9b8a8203e1771bf9bd108e74a7..b7b70b805e22928a28bbdee5be08b9d869f7aae5 100644 (file)
--- a/lib/table/meson.build
+++ b/lib/table/meson.build
@@ -36,5 +36,5 @@ deps += ['mbuf', 'port', 'lpm', 'hash', 'acl']
 indirect_headers += files(
         'rte_lru_arm64.h',
         'rte_lru_x86.h',
-        'rte_table_hash_func_arm64.h'
+        'rte_table_hash_func_arm64.h',
 )