From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by dpdk.org (Postfix) with ESMTP id 7EDAB9957 for ; Mon, 14 Aug 2017 12:03:26 +0200 (CEST) Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 14 Aug 2017 03:03:26 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.41,372,1498546800"; d="scan'208";a="118723771" Received: from silpixa00399126.ir.intel.com (HELO silpixa00399126.ger.corp.intel.com) ([10.237.223.223]) by orsmga004.jf.intel.com with ESMTP; 14 Aug 2017 03:03:24 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: thomas@monjalon.net, Bruce Richardson Date: Mon, 14 Aug 2017 10:51:43 +0100 Message-Id: <20170814095208.166496-16-bruce.richardson@intel.com> X-Mailer: git-send-email 2.13.4 In-Reply-To: <20170814095208.166496-1-bruce.richardson@intel.com> References: <20170814095208.166496-1-bruce.richardson@intel.com> Subject: [dpdk-dev] [RFCv2 15/40] build: set up standard deps for drivers X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Aug 2017 10:03:27 -0000 Driver should not need to specify that they depend on EAL, mempool, mbuf etc., since all drivers are likely to depend on those. Instead, have it that drivers only need to append to the deps array any extra dependencies they have. Signed-off-by: Bruce Richardson --- drivers/net/i40e/meson.build | 7 ++----- drivers/net/ixgbe/meson.build | 7 ++----- drivers/net/meson.build | 4 +++- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/drivers/net/i40e/meson.build b/drivers/net/i40e/meson.build index ea7f73d8e..3786af1ed 100644 --- a/drivers/net/i40e/meson.build +++ b/drivers/net/i40e/meson.build @@ -48,17 +48,14 @@ sources = files( 'rte_pmd_i40e.c' ) -deps = [rte_eal, rte_net, - rte_mbuf, rte_ether, - rte_mempool, rte_ring, - rte_hash, rte_kvargs] +deps += rte_hash if arch_subdir == 'x86' dpdk_conf.set('RTE_LIBRTE_I40E_INC_VECTOR', 1) sources += files('i40e_rxtx_vec_sse.c') endif -includes = include_directories('base', '.') +includes = include_directories('base') install_headers('rte_pmd_i40e.h') diff --git a/drivers/net/ixgbe/meson.build b/drivers/net/ixgbe/meson.build index b1efd96be..65c215271 100644 --- a/drivers/net/ixgbe/meson.build +++ b/drivers/net/ixgbe/meson.build @@ -46,16 +46,13 @@ sources = files( 'rte_pmd_ixgbe.c' ) -deps = [rte_eal, rte_net, - rte_mbuf, rte_ether, - rte_mempool, rte_ring, - rte_hash, rte_kvargs] +deps += rte_hash if arch_subdir == 'x86' dpdk_conf.set('RTE_IXGBE_INC_VECTOR', 1) sources += files('ixgbe_rxtx_vec_sse.c') endif -includes = include_directories('base', '.') +includes = include_directories('base') install_headers('rte_pmd_ixgbe.h') diff --git a/drivers/net/meson.build b/drivers/net/meson.build index eccdc83d7..c1728e700 100644 --- a/drivers/net/meson.build +++ b/drivers/net/meson.build @@ -38,8 +38,10 @@ foreach drv:drivers sources = [] libs = [] cflags = [] - deps = [] includes = [] + # set up standard deps. Drivers can append/override as necessary + deps = [rte_eal, rte_net, rte_mbuf, rte_ether, + rte_mempool, rte_ring, rte_kvargs] # pull in driver directory which should assign to each of the above subdir(drv) -- 2.13.4