X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=lib%2Flibrte_eal%2Fcommon%2Fmeson.build;h=edfca77779e712996bf0aa2ad301b675fd4bab0a;hb=f2cdd95f2d3f09ed84d33ba62d275e590b10fd67;hp=b7fc98499797165a593ad221cdf3a03d3717e857;hpb=888904417d396a4b10ff673588b68b7e6ccccf64;p=dpdk.git

diff --git a/lib/librte_eal/common/meson.build b/lib/librte_eal/common/meson.build
index b7fc984997..edfca77779 100644
--- a/lib/librte_eal/common/meson.build
+++ b/lib/librte_eal/common/meson.build
@@ -1,102 +1,88 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2017 Intel Corporation
 
-eal_inc += include_directories('.', 'include',
-		join_paths('include/arch', arch_subdir))
+includes += include_directories('.')
 
-common_objs = []
-common_sources = files(
-	'eal_common_bus.c',
-	'eal_common_cpuflags.c',
-	'eal_common_class.c',
-	'eal_common_devargs.c',
-	'eal_common_dev.c',
-	'eal_common_errno.c',
-	'eal_common_fbarray.c',
-	'eal_common_hexdump.c',
-	'eal_common_hypervisor.c',
-	'eal_common_launch.c',
-	'eal_common_lcore.c',
-	'eal_common_log.c',
-	'eal_common_memalloc.c',
-	'eal_common_memory.c',
-	'eal_common_memzone.c',
-	'eal_common_options.c',
-	'eal_common_proc.c',
-	'eal_common_string_fns.c',
-	'eal_common_tailqs.c',
-	'eal_common_thread.c',
-	'eal_common_timer.c',
-	'eal_common_uuid.c',
-	'malloc_elem.c',
-	'malloc_heap.c',
-	'malloc_mp.c',
-	'rte_keepalive.c',
-	'rte_malloc.c',
-	'rte_reciprocal.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
+cflags += [ '-DABI_VERSION="@0@"'.format(abi_version) ]
 
-common_headers = files(
-	'include/rte_alarm.h',
-	'include/rte_branch_prediction.h',
-	'include/rte_bus.h',
-	'include/rte_bitmap.h',
-	'include/rte_class.h',
-	'include/rte_common.h',
-	'include/rte_debug.h',
-	'include/rte_devargs.h',
-	'include/rte_dev.h',
-	'include/rte_eal.h',
-	'include/rte_eal_memconfig.h',
-	'include/rte_eal_interrupts.h',
-	'include/rte_errno.h',
-	'include/rte_fbarray.h',
-	'include/rte_hexdump.h',
-	'include/rte_hypervisor.h',
-	'include/rte_interrupts.h',
-	'include/rte_keepalive.h',
-	'include/rte_launch.h',
-	'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_pci_dev_feature_defs.h',
-	'include/rte_pci_dev_features.h',
-	'include/rte_per_lcore.h',
-	'include/rte_random.h',
-	'include/rte_reciprocal.h',
-	'include/rte_service.h',
-	'include/rte_service_component.h',
-	'include/rte_string_fns.h',
-	'include/rte_tailq.h',
-	'include/rte_time.h',
-	'include/rte_uuid.h',
-	'include/rte_version.h')
+if is_windows
+    sources += files(
+            'eal_common_bus.c',
+            'eal_common_class.c',
+            'eal_common_config.c',
+            'eal_common_debug.c',
+            'eal_common_dev.c',
+            'eal_common_devargs.c',
+            'eal_common_dynmem.c',
+            'eal_common_errno.c',
+            'eal_common_fbarray.c',
+            'eal_common_hexdump.c',
+            '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',
+            'eal_common_options.c',
+            'eal_common_string_fns.c',
+            'eal_common_tailqs.c',
+            'eal_common_thread.c',
+            'eal_common_trace_points.c',
+            'malloc_elem.c',
+            'malloc_heap.c',
+            'rte_malloc.c',
+            'eal_common_timer.c',
+            'rte_random.c',
+            'rte_reciprocal.c',
+            'rte_service.c',
+            'rte_version.c',
+    )
+    subdir_done()
+endif
 
-# special case install the generic headers, since they go in a subdir
-generic_headers = files(
-	'include/generic/rte_atomic.h',
-	'include/generic/rte_byteorder.h',
-	'include/generic/rte_cpuflags.h',
-	'include/generic/rte_cycles.h',
-	'include/generic/rte_io.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_vect.h')
-install_headers(generic_headers, subdir: 'generic')
+sources += files(
+        'eal_common_bus.c',
+        'eal_common_cpuflags.c',
+        'eal_common_class.c',
+        'eal_common_config.c',
+        'eal_common_debug.c',
+        'eal_common_devargs.c',
+        'eal_common_dev.c',
+        'eal_common_errno.c',
+        'eal_common_fbarray.c',
+        'eal_common_hexdump.c',
+        'eal_common_hypervisor.c',
+        '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',
+        'eal_common_options.c',
+        'eal_common_proc.c',
+        'eal_common_string_fns.c',
+        'eal_common_tailqs.c',
+        'eal_common_thread.c',
+        'eal_common_timer.c',
+        'eal_common_trace.c',
+        'eal_common_trace_ctf.c',
+        'eal_common_trace_points.c',
+        'eal_common_trace_utils.c',
+        'eal_common_uuid.c',
+        'hotplug_mp.c',
+        'malloc_elem.c',
+        'malloc_heap.c',
+        'malloc_mp.c',
+        'rte_keepalive.c',
+        'rte_malloc.c',
+        'rte_random.c',
+        'rte_reciprocal.c',
+        'rte_service.c',
+        'rte_version.c',
+)
 
-# get and install the architecture specific headers
-subdir(join_paths('include/arch', arch_subdir))
+if is_linux
+    sources += files('eal_common_dynmem.c')
+endif