X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=lib%2Flibrte_eal%2Fmeson.build;h=8d492897d5d32670e81df0dd987e61e08f5d9761;hb=f74904ce98e84f48e8f3a96b7ad6b6347c3f44b6;hp=15d1c6afd305c88a8e716313778e57f60d26dc07;hpb=acaa9ee991b584d536ffa9529f063d11be7923a4;p=dpdk.git

diff --git a/lib/librte_eal/meson.build b/lib/librte_eal/meson.build
index 15d1c6afd3..8d492897d5 100644
--- a/lib/librte_eal/meson.build
+++ b/lib/librte_eal/meson.build
@@ -1,31 +1,30 @@
 # SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2017 Intel Corporation
+# Copyright(c) 2017-2019 Intel Corporation
 
-# Custom EAL processing. EAL is complicated enough that it can't just
-# have a straight list of headers and source files.
-# Initially pull in common settings
-eal_inc = [global_inc]
-subdir('common') # defines common_sources, common_objs, etc.
+includes += global_inc
+subdir('include')
 
-# Now do OS/exec-env specific settings, including building kernel modules
-# The <exec-env>/eal/meson.build file should define env_sources, etc.
-if host_machine.system() == 'linux'
-	dpdk_conf.set('RTE_EXEC_ENV_LINUXAPP', 1)
-	subdir('linuxapp/eal')
+subdir('common')
 
-elif host_machine.system() == 'freebsd'
-	dpdk_conf.set('RTE_EXEC_ENV_BSDAPP', 1)
-	subdir('bsdapp/eal')
-
-else
-	error('unsupported system type @0@'.format(hostmachine.system()))
+if not is_windows
+	subdir('unix')
 endif
 
-version = 6  # the version of the EAL API
-allow_experimental_apis = true
-deps += 'compat'
-cflags += '-D_GNU_SOURCE'
-sources = common_sources + env_sources
-objs = common_objs + env_objs
-headers = common_headers + env_headers
-includes = eal_inc
+dpdk_conf.set('RTE_EXEC_ENV_' + exec_env.to_upper(), 1)
+subdir(exec_env)
+
+subdir(arch_subdir)
+
+deps += ['kvargs']
+if not is_windows
+	deps += ['telemetry']
+endif
+if dpdk_conf.has('RTE_USE_LIBBSD')
+	ext_deps += libbsd
+endif
+if cc.has_function('getentropy', prefix : '#include <unistd.h>')
+	cflags += '-DRTE_LIBEAL_USE_GETENTROPY'
+endif
+if cc.has_header('getopt.h')
+	cflags += ['-DHAVE_GETOPT_H', '-DHAVE_GETOPT', '-DHAVE_GETOPT_LONG']
+endif