X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=examples%2Fmeson.build;h=46ec80919e4c161e075fef5a10fcaff0e26c47b2;hb=388dd1c9a6d4f9c3c4b788fa05049220e289345b;hp=1995f4dcb666a1615ae6f52865dce9a821c97270;hpb=85d7158edf153853dd5aaec7a0b90b81e453e4b6;p=dpdk.git

diff --git a/examples/meson.build b/examples/meson.build
index 1995f4dcb6..46ec80919e 100644
--- a/examples/meson.build
+++ b/examples/meson.build
@@ -1,23 +1,52 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # 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)
 
-all_examples = run_command('sh', '-c',
-	'cd $MESON_SOURCE_ROOT/$MESON_SUBDIR && for d in * ; do if [ -d $d ] ; then echo $d ; fi ; done'
-	).stdout().split()
-# install all example code on install - irrespective of whether the example in
-# question is to be built as part of this build or not.
-foreach ex:all_examples
-	install_subdir(ex,
-			install_dir: get_option('datadir') + '/dpdk/examples',
-			exclude_files: 'meson.build')
-endforeach
+# 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()
@@ -35,11 +64,8 @@ if cc.has_argument('-Wno-format-truncation')
 	default_cflags += '-Wno-format-truncation'
 endif
 
-# specify -D_GNU_SOURCE unconditionally
-default_cflags += '-D_GNU_SOURCE'
-
 foreach example: examples
-	name = example
+	name = example.split('/')[-1]
 	build = true
 	sources = []
 	allow_experimental_apis = false
@@ -48,9 +74,6 @@ foreach example: examples
 	ext_deps = [execinfo]
 	includes = [include_directories(example)]
 	deps = ['eal', 'mempool', 'net', 'mbuf', 'ethdev', 'cmdline']
-	if is_windows
-		deps = ['eal'] # only supported lib on Windows currently
-	endif
 	subdir(example)
 
 	if build
@@ -67,7 +90,7 @@ foreach example: examples
 		endif
 		executable('dpdk-' + name, sources,
 			include_directories: includes,
-			link_whole: driver_libs,
+			link_whole: link_whole_libs,
 			link_args: dpdk_extra_ldflags,
 			c_args: cflags,
 			dependencies: dep_objs)