X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=examples%2Fmeson.build;h=b9ab24223f52bd501947c1123351ea0e0bfc5815;hb=6c02043e9967a9d8f6e8c058256e257efe1d6d1a;hp=af81c762e8532d0383958d3dce020bd3ad07bfb9;hpb=5d7b673d5fd6663b20c675dd382d9fb43b42af18;p=dpdk.git

diff --git a/examples/meson.build b/examples/meson.build
index af81c762e8..b9ab24223f 100644
--- a/examples/meson.build
+++ b/examples/meson.build
@@ -1,19 +1,60 @@
 # SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2017 Intel Corporation
+# Copyright(c) 2017-2019 Intel Corporation
 
-driver_libs = []
+link_whole_libs = []
 if get_option('default_library') == 'static'
-	driver_libs = dpdk_drivers
+	link_whole_libs = dpdk_static_libraries + dpdk_drivers
 endif
 
 execinfo = cc.find_library('execinfo', required: false)
 
-allow_skips = true # don't flag an error if we can't build an app
+# list of all example apps. Keep 1-3 per line, in alphabetical order.
+all_examples = [
+	'bbdev_app', 'bond',
+	'cmdline',
+	'distributor', 'ethtool',
+	'eventdev_pipeline',
+	'fips_validation', 'flow_classify',
+	'flow_filtering', 'helloworld',
+	'ioat',
+	'ip_fragmentation', 'ip_pipeline',
+	'ip_reassembly', 'ipsec-secgw',
+	'ipv4_multicast', 'kni',
+	'l2fwd', 'l2fwd-cat', 'l2fwd-event',
+	'l2fwd-crypto', 'l2fwd-jobstats',
+	'l2fwd-keepalive', 'l3fwd',
+	'l3fwd-acl', 'l3fwd-power', 'l3fwd-graph',
+	'link_status_interrupt',
+	'multi_process/client_server_mp/mp_client',
+	'multi_process/client_server_mp/mp_server',
+	'multi_process/hotplug_mp',
+	'multi_process/simple_mp',
+	'multi_process/symmetric_mp',
+	'ntb', 'packet_ordering',
+	'performance-thread/l3fwd-thread',
+	'performance-thread/pthread_shim',
+	'pipeline',
+	'ptpclient',
+	'qos_meter', 'qos_sched',
+	'rxtx_callbacks',
+	'server_node_efd/node',
+	'server_node_efd/server',
+	'service_cores',
+	'skeleton',
+	'timer', 'vdpa',
+	'vhost', 'vhost_crypto',
+	'vhost_blk', 'vm_power_manager',
+	'vm_power_manager/guest_cli',
+	'vmdq', 'vmdq_dcb',
+]
+
+if get_option('examples') == ''
+	subdir_done()
+endif
 
 if get_option('examples').to_lower() == 'all'
-	dirs = run_command('sh', '-c',
-		'cd $MESON_SOURCE_ROOT/$MESON_SUBDIR && for d in * ; do if [ -d $d ] ; then echo $d ; fi ; done')
-	examples = dirs.stdout().split()
+	examples = all_examples
+	allow_skips = true # don't flag an error if we can't build an app
 else
 	examples = get_option('examples').split(',')
 	allow_skips = false # error out if we can't build a requested app
@@ -22,16 +63,18 @@ default_cflags = machine_args
 if cc.has_argument('-Wno-format-truncation')
 	default_cflags += '-Wno-format-truncation'
 endif
-
-# specify -D_GNU_SOURCE unconditionally
-default_cflags += '-D_GNU_SOURCE'
+default_ldflags = dpdk_extra_ldflags
+if get_option('default_library') == 'static' and not is_windows
+	default_ldflags += ['-Wl,--export-dynamic']
+endif
 
 foreach example: examples
-	name = example
+	name = example.split('/')[-1]
 	build = true
 	sources = []
 	allow_experimental_apis = false
 	cflags = default_cflags
+	ldflags = default_ldflags
 
 	ext_deps = [execinfo]
 	includes = [include_directories(example)]
@@ -52,8 +95,8 @@ foreach example: examples
 		endif
 		executable('dpdk-' + name, sources,
 			include_directories: includes,
-			link_whole: driver_libs,
-			link_args: dpdk_extra_ldflags,
+			link_whole: link_whole_libs,
+			link_args: ldflags,
 			c_args: cflags,
 			dependencies: dep_objs)
 	elif not allow_skips