eal: simplify meson build of common directory

[dpdk.git] / lib / librte_eal / common / meson.build

diff --git a/lib/librte_eal/common/meson.build b/lib/librte_eal/common/meson.build
index 2a10d57..5885441 100644 (file)
--- a/lib/librte_eal/common/meson.build
+++ b/lib/librte_eal/common/meson.build
@@ -1,11 +1,23 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2017 Intel Corporation
 
-eal_inc += include_directories('.', 'include',
-               join_paths('include/arch', arch_subdir))
+eal_inc += include_directories('.', 'include')
 
-common_objs = []
-common_sources = files(
+if is_windows
+       sources += files(
+               'eal_common_bus.c',
+               'eal_common_class.c',
+               'eal_common_devargs.c',
+               'eal_common_errno.c',
+               'eal_common_launch.c',
+               'eal_common_lcore.c',
+               'eal_common_log.c',
+               'eal_common_options.c',
+               'eal_common_thread.c',
+               'rte_option.c',
+       )
+else # temporary bad indent
+sources += files(
        'eal_common_bus.c',
        'eal_common_cpuflags.c',
        'eal_common_class.c',
@@ -18,6 +30,7 @@ common_sources = files(
        'eal_common_launch.c',
        'eal_common_lcore.c',
        'eal_common_log.c',
+       'eal_common_mcfg.c',
        'eal_common_memalloc.c',
        'eal_common_memory.c',
        'eal_common_memzone.c',
@@ -35,16 +48,11 @@ common_sources = files(
        'rte_keepalive.c',
        'rte_malloc.c',
        'rte_option.c',
+       'rte_random.c',
        'rte_reciprocal.c',
-       'rte_service.c'
+       'rte_service.c',
 )
-
-# get architecture specific sources and objs
-eal_common_arch_sources = []
-eal_common_arch_objs = []
-subdir(join_paths('arch', arch_subdir))
-common_sources += eal_common_arch_sources
-common_objs += eal_common_arch_objs
+endif
 
 common_headers = files(
        'include/rte_alarm.h',
@@ -53,6 +61,7 @@ common_headers = files(
        'include/rte_bitmap.h',
        'include/rte_class.h',
        'include/rte_common.h',
+       'include/rte_compat.h',
        'include/rte_debug.h',
        'include/rte_devargs.h',
        'include/rte_dev.h',
@@ -69,7 +78,6 @@ common_headers = files(
        'include/rte_lcore.h',
        'include/rte_log.h',
        'include/rte_malloc.h',
-       'include/rte_malloc_heap.h',
        'include/rte_memory.h',
        'include/rte_memzone.h',
        'include/rte_option.h',
@@ -84,7 +92,8 @@ common_headers = files(
        'include/rte_tailq.h',
        'include/rte_time.h',
        'include/rte_uuid.h',
-       'include/rte_version.h')
+       'include/rte_version.h',
+       'include/rte_vfio.h')
 
 # special case install the generic headers, since they go in a subdir
 generic_headers = files(
@@ -93,13 +102,12 @@ generic_headers = files(
        'include/generic/rte_cpuflags.h',
        'include/generic/rte_cycles.h',
        'include/generic/rte_io.h',
+       'include/generic/rte_mcslock.h',
        'include/generic/rte_memcpy.h',
        'include/generic/rte_pause.h',
        'include/generic/rte_prefetch.h',
        'include/generic/rte_rwlock.h',
        'include/generic/rte_spinlock.h',
+       'include/generic/rte_ticketlock.h',
        'include/generic/rte_vect.h')
 install_headers(generic_headers, subdir: 'generic')
-
-# get and install the architecture specific headers
-subdir(join_paths('include/arch', arch_subdir))