X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=drivers%2Fmeson.build;h=dc47b45eca9f11d0ffaeee0931073a9bef0fd146;hb=6567f9d59a749be59583e18bc429752d8139563f;hp=b6ce974de3fd88025a1130981f9c497ebd5694c4;hpb=806c45dd483dfec319028758210d9faee731ca8e;p=dpdk.git diff --git a/drivers/meson.build b/drivers/meson.build index b6ce974de3..dc47b45eca 100644 --- a/drivers/meson.build +++ b/drivers/meson.build @@ -1,21 +1,27 @@ # SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Intel Corporation +# Copyright(c) 2017-2019 Intel Corporation + +if is_windows + subdir_done() +endif # Defines the order in which the drivers are buit. -driver_classes = ['common', +dpdk_driver_classes = ['common', 'bus', 'mempool', # depends on common and bus. 'net', # depends on common, bus and mempool. 'crypto', # depends on common, bus and mempool (net in future). 'compress', # depends on common, bus, mempool. 'event', # depends on common, bus, mempool and net. + 'baseband', # depends on common and bus. 'raw'] # depends on common, bus, mempool, net and event. default_cflags = machine_args if cc.has_argument('-Wno-format-truncation') default_cflags += '-Wno-format-truncation' endif -foreach class:driver_classes + +foreach class:dpdk_driver_classes drivers = [] std_deps = [] config_flag_fmt = '' # format string used to set the value in dpdk_conf @@ -41,10 +47,11 @@ foreach class:driver_classes # set up internal deps. Drivers can append/override as necessary deps = std_deps # ext_deps: Stores external library dependency got - # using dependency() or cc.find_library(). For most cases, we - # probably also need to specify the "-l" flags in - # pkgconfig_extra_libs variable too, so that it can be reflected - # in the pkgconfig output for static builds + # using dependency() (preferred) or find_library(). + # For the find_library() case (but not with dependency()) we also + # need to specify the "-l" flags in pkgconfig_extra_libs variable + # too, so that it can be reflected in the pkgconfig output for + # static builds. ext_deps = [] pkgconfig_extra_libs = [] @@ -97,10 +104,8 @@ foreach class:driver_classes lib_version = '@0@.1'.format(version) so_version = '@0@'.format(version) else - pver = meson.project_version().split('.') - lib_version = '@0@.@1@'.format(pver.get(0), - pver.get(1)) - so_version = lib_version + lib_version = major_version + so_version = major_version endif # now build the static driver