From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from proxy.6wind.com (host.76.145.23.62.rev.coltfrance.com [62.23.145.76]) by dpdk.org (Postfix) with ESMTP id DD7A010FC0 for ; Thu, 30 Mar 2017 14:32:06 +0200 (CEST) Received: from glumotte.dev.6wind.com (unknown [10.16.0.195]) by proxy.6wind.com (Postfix) with ESMTP id 8DF1726B3E; Thu, 30 Mar 2017 14:32:01 +0200 (CEST) From: Olivier Matz To: dev@dpdk.org Cc: thomas.monjalon@6wind.com, ferruh.yigit@intel.com Date: Thu, 30 Mar 2017 14:32:28 +0200 Message-Id: <20170330123228.28567-1-olivier.matz@6wind.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170330141120.2dbefae4@platinum> References: <20170330141120.2dbefae4@platinum> Subject: [dpdk-dev] [PATCH] mk: fix dependencies to optional configs 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: Thu, 30 Mar 2017 12:32:07 -0000 In rte.lib.mk, the list of libraries passed to the link command (LDLIBS) is generated from the DEPDIRS-xxx variables. If a library is not compiled because it is disabled in configuration, it should not appear in DEPDIRS-xxx. - librte_port depends on librte_kni only if it is enabled. - librte_table depends on librte_acl only if it is enabled. Fixes: feb9f680cd2c ("mk: optimize directory dependencies") Reported-by: Ferruh Yigit Signed-off-by: Olivier Matz --- lib/Makefile | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/lib/Makefile b/lib/Makefile index 456eb38a4..b2545ff70 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -81,10 +81,16 @@ DIRS-$(CONFIG_RTE_LIBRTE_DISTRIBUTOR) += librte_distributor DEPDIRS-librte_distributor := librte_eal librte_mbuf librte_ether DIRS-$(CONFIG_RTE_LIBRTE_PORT) += librte_port DEPDIRS-librte_port := librte_eal librte_mempool librte_mbuf librte_ether -DEPDIRS-librte_port += librte_ip_frag librte_sched librte_kni +DEPDIRS-librte_port += librte_ip_frag librte_sched +ifeq ($(CONFIG_RTE_LIBRTE_KNI),y) +DEPDIRS-librte_port += librte_kni +endif DIRS-$(CONFIG_RTE_LIBRTE_TABLE) += librte_table DEPDIRS-librte_table := librte_eal librte_mempool librte_mbuf -DEPDIRS-librte_table += librte_port librte_lpm librte_acl librte_hash +DEPDIRS-librte_table += librte_port librte_lpm librte_hash +ifeq ($(CONFIG_RTE_LIBRTE_ACL),y) +DEPDIRS-librte_table += librte_acl +endif DIRS-$(CONFIG_RTE_LIBRTE_PIPELINE) += librte_pipeline DEPDIRS-librte_pipeline := librte_eal librte_mempool librte_mbuf DEPDIRS-librte_pipeline += librte_table librte_port -- 2.11.0