X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;ds=sidebyside;f=app%2Ftest-pmd%2Fmeson.build;h=7e9c7bdd697173cf3e5f8b8db0d5890be945b04f;hb=3127f99274b679124658afdbfc49210730c50617;hp=4614e350607377493f03c88689ed1325cefe6715;hpb=b114af1603db1e955c7efc94370b1d83bbb8f31f;p=dpdk.git

diff --git a/app/test-pmd/meson.build b/app/test-pmd/meson.build
index 4614e35060..7e9c7bdd69 100644
--- a/app/test-pmd/meson.build
+++ b/app/test-pmd/meson.build
@@ -1,7 +1,11 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2017 Intel Corporation
 
-sources = files('cmdline.c',
+# override default name to drop the hyphen
+name = 'testpmd'
+cflags += '-Wno-deprecated-declarations'
+sources = files('5tswap.c',
+	'cmdline.c',
 	'cmdline_flow.c',
 	'cmdline_mtr.c',
 	'cmdline_tm.c',
@@ -13,40 +17,45 @@ sources = files('cmdline.c',
 	'iofwd.c',
 	'macfwd.c',
 	'macswap.c',
+	'noisy_vnf.c',
 	'parameters.c',
 	'rxonly.c',
 	'testpmd.c',
-	'txonly.c')
+	'txonly.c',
+	'util.c')
 
-deps = ['ethdev', 'gro', 'gso', 'cmdline', 'metrics', 'meter', 'bus_pci']
-if dpdk_conf.has('RTE_LIBRTE_PDUMP')
+deps += ['ethdev', 'gro', 'gso', 'cmdline', 'metrics', 'meter', 'bus_pci']
+if dpdk_conf.has('RTE_LIB_BITRATESTATS')
+	deps += 'bitratestats'
+endif
+if dpdk_conf.has('RTE_LIB_PDUMP')
 	deps += 'pdump'
 endif
-if dpdk_conf.has('RTE_LIBRTE_I40E_PMD')
-	deps += 'pmd_i40e'
+if dpdk_conf.has('RTE_LIB_BITRATESTATS')
+	deps += 'bitratestats'
 endif
-if dpdk_conf.has('RTE_LIBRTE_IXGBE_PMD')
-	deps += 'pmd_ixgbe'
+if dpdk_conf.has('RTE_LIB_LATENCYSTATS')
+	deps += 'latencystats'
 endif
-if dpdk_conf.has('RTE_LIBRTE_SOFTNIC_PMD')
-	sources += files('tm.c')
-	deps += 'pmd_softnic'
+if dpdk_conf.has('RTE_CRYPTO_SCHEDULER')
+	deps += 'crypto_scheduler'
 endif
-
-dep_objs = []
-foreach d:deps
-	dep_objs += get_variable(get_option('default_library') + '_rte_' + d)
-endforeach
-
-link_libs = []
-if get_option('default_library') == 'static'
-	link_libs = dpdk_drivers
+if dpdk_conf.has('RTE_NET_BOND')
+	deps += 'net_bond'
+endif
+if dpdk_conf.has('RTE_NET_BNXT')
+	deps += 'net_bnxt'
+endif
+if dpdk_conf.has('RTE_NET_I40E')
+	deps += 'net_i40e'
+endif
+if dpdk_conf.has('RTE_NET_IXGBE')
+	deps += 'net_ixgbe'
+endif
+if dpdk_conf.has('RTE_NET_DPAA')
+	deps += ['bus_dpaa', 'mempool_dpaa', 'net_dpaa']
+endif
+if dpdk_conf.has('RTE_LIB_BPF')
+	sources += files('bpf_cmd.c')
+	deps += 'bpf'
 endif
-
-executable('dpdk-testpmd',
-	sources,
-	c_args: [machine_arg, '-DALLOW_EXPERIMENTAL_API'],
-	link_whole: link_libs,
-	dependencies: dep_objs,
-	install_rpath: join_paths(get_option('prefix'), driver_install_path),
-	install: true)