X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=app%2Fmeson.build;h=87fc195dbf52a44a6e48cd8b9868d739957669ba;hb=41c60f74d85f2e889dfdd155bc4e30cf00913914;hp=e949624b701d9b427e663f1b4cd129f17597ef84;hpb=fa647c5722b86cdabb1ed60701ef7eb6095bbd66;p=dpdk.git

diff --git a/app/meson.build b/app/meson.build
index e949624b70..87fc195dbf 100644
--- a/app/meson.build
+++ b/app/meson.build
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2017-2019 Intel Corporation
 
-if host_machine.system() == 'windows'
+if is_windows
 	subdir_done()
 endif
 
@@ -14,31 +14,36 @@ apps = [
 	'test-compress-perf',
 	'test-crypto-perf',
 	'test-eventdev',
+	'test-fib',
+	'test-flow-perf',
 	'test-pipeline',
-	'test-pmd']
+	'test-pmd',
+	'test-regex',
+	'test-sad']
 
 # for BSD only
 lib_execinfo = cc.find_library('execinfo', required: false)
 
-default_cflags = machine_args
-
-# specify -D_GNU_SOURCE unconditionally
-default_cflags += '-D_GNU_SOURCE'
+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
-	allow_experimental_apis = false
 	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 = dpdk_app_link_libraries
+	deps = []
 
 	subdir(name)
 
@@ -55,15 +60,13 @@ foreach app:apps
 			link_libs = dpdk_static_libraries + dpdk_drivers
 		endif
 
-		if allow_experimental_apis
-			cflags += '-DALLOW_EXPERIMENTAL_API'
-		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)