X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=app%2Ftest-pmd%2Fmeson.build;h=7e9c7bdd697173cf3e5f8b8db0d5890be945b04f;hb=3127f99274b679124658afdbfc49210730c50617;hp=001d4f663b157f7de5f698ae45aac18e74143415;hpb=147ec15015263d3f209511977753acd301604e69;p=dpdk.git

diff --git a/app/test-pmd/meson.build b/app/test-pmd/meson.build
index 001d4f663b..7e9c7bdd69 100644
--- a/app/test-pmd/meson.build
+++ b/app/test-pmd/meson.build
@@ -1,35 +1,11 @@
-#   BSD LICENSE
-#
-#   Copyright(c) 2017 Intel Corporation.
-#   All rights reserved.
-#
-#   Redistribution and use in source and binary forms, with or without
-#   modification, are permitted provided that the following conditions
-#   are met:
-#
-#     * Redistributions of source code must retain the above copyright
-#       notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above copyright
-#       notice, this list of conditions and the following disclaimer in
-#       the documentation and/or other materials provided with the
-#       distribution.
-#     * Neither the name of Intel Corporation nor the names of its
-#       contributors may be used to endorse or promote products derived
-#       from this software without specific prior written permission.
-#
-#   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-#   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-#   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-#   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-#   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-#   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-#   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-#   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-#   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-#   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# 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',
@@ -41,41 +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']
-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('dep_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: '-DALLOW_EXPERIMENTAL_API',
-	link_whole: link_libs,
-	dependencies: dep_objs,
-	link_args: eal_extra_link_arg, # add -ldl for linux, -lexecinfo for BSD
-	install_rpath: join_paths(get_option('prefix'), driver_install_path),
-	install: true)