X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=app%2Fmeson.build;h=e41a2e3902365be8aacfce9fa25da551c2fd7116;hb=741bb850ee2adb55d03ac1d70433894006784253;hp=0f7fe946494c638a1703511ad854ed0647e59f83;hpb=acec04c4b2f5c75d244319e1d0ca17ea7d4da72d;p=dpdk.git

diff --git a/app/meson.build b/app/meson.build
index 0f7fe94649..e41a2e3902 100644
--- a/app/meson.build
+++ b/app/meson.build
@@ -1,67 +1,70 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2017-2019 Intel Corporation
 
-if is_windows
-	subdir_done()
-endif
-
 apps = [
-	'pdump',
-	'proc-info',
-	'test-acl',
-	'test-bbdev',
-	'test-cmdline',
-	'test-compress-perf',
-	'test-crypto-perf',
-	'test-eventdev',
-	'test-fib',
-	'test-pipeline',
-	'test-pmd',
-	'test-sad']
-
-# for BSD only
-lib_execinfo = cc.find_library('execinfo', required: false)
+        'dumpcap',
+        'pdump',
+        'proc-info',
+        'test-acl',
+        'test-bbdev',
+        'test-cmdline',
+        'test-compress-perf',
+        'test-crypto-perf',
+        'test-eventdev',
+        'test-fib',
+        'test-flow-perf',
+        'test-pipeline',
+        'test-pmd',
+        'test-regex',
+        'test-sad',
+]
 
 default_cflags = machine_args + ['-DALLOW_EXPERIMENTAL_API']
+default_ldflags = []
+if get_option('default_library') == 'static' and not is_windows
+    default_ldflags += ['-Wl,--export-dynamic']
+endif
 
 foreach app:apps
-	build = true
-	name = app
-	sources = []
-	includes = []
-	cflags = default_cflags
-	objs = [] # other object files to link against, used e.g. for
-	          # instruction-set optimized versions of code
+    build = true
+    name = app
+    sources = []
+    includes = []
+    cflags = default_cflags
+    ldflags = default_ldflags
+    objs = [] # other object files to link against, used e.g. for
+              # instruction-set optimized versions of code
+
+    # use "deps" for internal DPDK dependencies, and "ext_deps" for
+    # external package/library requirements
+    ext_deps = []
+    deps = []
 
-	# use "deps" for internal DPDK dependencies, and "ext_deps" for
-	# external package/library requirements
-	ext_deps = []
-	deps = dpdk_app_link_libraries
+    subdir(name)
 
-	subdir(name)
+    if not build
+        continue
+    endif
 
-	if build
-		dep_objs = []
-		foreach d:deps
-			dep_objs += get_variable(get_option('default_library')
-				 + '_rte_' + d)
-		endforeach
-		dep_objs += lib_execinfo
+    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_static_libraries + dpdk_drivers
-		endif
+    link_libs = []
+    if get_option('default_library') == 'static'
+        link_libs = dpdk_static_libraries + dpdk_drivers
+    endif
 
-		executable('dpdk-' + name,
-				sources,
-				c_args: cflags,
-				link_whole: link_libs,
-				dependencies: dep_objs,
-				install_rpath: join_paths(get_option('prefix'),
-						 driver_install_path),
-				install: true)
-	endif
+    executable('dpdk-' + name,
+            sources,
+            c_args: cflags,
+            link_args: ldflags,
+            link_whole: link_libs,
+            dependencies: dep_objs,
+            include_directories: includes,
+            install_rpath: join_paths(get_option('prefix'), driver_install_path),
+            install: true)
 endforeach
 
 # special case the autotests