net/bnxt: fix scalar Rx datapath on Thor

[dpdk.git] / drivers / net / e1000 / base / meson.build

diff --git a/drivers/net/e1000/base/meson.build b/drivers/net/e1000/base/meson.build
index 7c0710e..528a33f 100644 (file)
--- a/drivers/net/e1000/base/meson.build
+++ b/drivers/net/e1000/base/meson.build
@@ -1,65 +1,38 @@
-#   BSD LICENSE
-#
-#   Copyright(c) 2017 Intel Corporation.
-#   All rights reserved.
-#
-#   Redistribution and use in source and binary forms, with or without
-#   modification, are permitted provided that the following conditions
-#   are met:
-#
-#     * Redistributions of source code must retain the above copyright
-#       notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above copyright
-#       notice, this list of conditions and the following disclaimer in
-#       the documentation and/or other materials provided with the
-#       distribution.
-#     * Neither the name of Intel Corporation nor the names of its
-#       contributors may be used to endorse or promote products derived
-#       from this software without specific prior written permission.
-#
-#   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-#   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-#   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-#   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-#   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-#   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-#   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-#   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-#   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-#   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2017 Intel Corporation
 
 sources = [
-       'e1000_80003es2lan.c',
-       'e1000_82540.c',
-       'e1000_82541.c',
-       'e1000_82542.c',
-       'e1000_82543.c',
-       'e1000_82571.c',
-       'e1000_82575.c',
-       'e1000_api.c',
-       'e1000_i210.c',
-       'e1000_ich8lan.c',
-       'e1000_mac.c',
-       'e1000_manage.c',
-       'e1000_mbx.c',
-       'e1000_nvm.c',
-       'e1000_osdep.c',
-       'e1000_phy.c',
-       'e1000_vf.c'
+        'e1000_base.c',
+        'e1000_80003es2lan.c',
+        'e1000_82540.c',
+        'e1000_82541.c',
+        'e1000_82542.c',
+        'e1000_82543.c',
+        'e1000_82571.c',
+        'e1000_82575.c',
+        'e1000_api.c',
+        'e1000_i210.c',
+        'e1000_ich8lan.c',
+        'e1000_mac.c',
+        'e1000_manage.c',
+        'e1000_mbx.c',
+        'e1000_nvm.c',
+        'e1000_osdep.c',
+        'e1000_phy.c',
+        'e1000_vf.c',
 ]
 
 error_cflags = ['-Wno-uninitialized', '-Wno-unused-parameter',
-       '-Wno-unused-variable', '-Wno-misleading-indentation',
-       '-Wno-implicit-fallthrough']
+    '-Wno-unused-variable', '-Wno-misleading-indentation',
+    '-Wno-implicit-fallthrough']
 c_args = cflags
 foreach flag: error_cflags
-       if cc.has_argument(flag)
-               c_args += flag
-       endif
+    if cc.has_argument(flag)
+        c_args += flag
+    endif
 endforeach
 
 base_lib = static_library('e1000_base', sources,
-       dependencies: dep_rte_eal,
-       c_args: c_args)
-base_objs = base_lib.extract_all_objects()
+    dependencies: static_rte_eal,
+    c_args: c_args)
+base_objs = base_lib.extract_all_objects(recursive: true)