From b63264c8342e6a1b6971c79550d2af2024b6a4de Mon Sep 17 00:00:00 2001
From: Luca Boccassi <luca.boccassi@gmail.com>
Date: Tue, 14 Aug 2018 18:52:30 +0100
Subject: New upstream version 18.08

Change-Id: I32fdf5e5016556d9c0a6d88ddaf1fc468961790a
Signed-off-by: Luca Boccassi <luca.boccassi@gmail.com>
---
 lib/librte_table/meson.build | 37 +++++++++++++++++++++----------------
 1 file changed, 21 insertions(+), 16 deletions(-)

(limited to 'lib/librte_table/meson.build')

diff --git a/lib/librte_table/meson.build b/lib/librte_table/meson.build
index 13e797b4..8b2f8413 100644
--- a/lib/librte_table/meson.build
+++ b/lib/librte_table/meson.build
@@ -1,24 +1,29 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2017 Intel Corporation
 
-version = 2
-sources = files('rte_table_lpm.c', 'rte_table_lpm_ipv6.c',
-		'rte_table_hash_cuckoo.c', 'rte_table_hash_key8.c',
-		'rte_table_hash_key16.c', 'rte_table_hash_key32.c',
-		'rte_table_hash_ext.c', 'rte_table_hash_lru.c',
-		'rte_table_array.c', 'rte_table_stub.c')
-headers = files('rte_table.h', 'rte_table_lpm.h',
-		'rte_table_lpm_ipv6.h', 'rte_table_hash.h',
-		'rte_lru.h', 'rte_table_array.h',
+version = 3
+sources = files('rte_table_acl.c',
+		'rte_table_lpm.c',
+		'rte_table_lpm_ipv6.c',
+		'rte_table_hash_cuckoo.c',
+		'rte_table_hash_key8.c',
+		'rte_table_hash_key16.c',
+		'rte_table_hash_key32.c',
+		'rte_table_hash_ext.c',
+		'rte_table_hash_lru.c',
+		'rte_table_array.c',
+		'rte_table_stub.c')
+headers = files('rte_table.h',
+		'rte_table_acl.h',
+		'rte_table_lpm.h',
+		'rte_table_lpm_ipv6.h',
+		'rte_table_hash.h',
+		'rte_table_hash_cuckoo.h',
+		'rte_lru.h',
+		'rte_table_array.h',
 		'rte_table_stub.h')
-deps += ['mbuf', 'port', 'lpm', 'hash']
+deps += ['mbuf', 'port', 'lpm', 'hash', 'acl']
 
 if arch_subdir == 'x86'
 	headers += files('rte_lru_x86.h')
 endif
-
-if dpdk_conf.has('RTE_LIBRTE_ACL')
-	sources += files('rte_table_acl.c')
-	headers += files('rte_table_acl.h')
-	deps += ['acl']
-endif
-- 
cgit 1.2.3-korg