From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm0-f68.google.com (mail-wm0-f68.google.com [74.125.82.68]) by dpdk.org (Postfix) with ESMTP id 3848A1B83B for ; Fri, 13 Apr 2018 15:22:59 +0200 (CEST) Received: by mail-wm0-f68.google.com with SMTP id x82so4183741wmg.1 for ; Fri, 13 Apr 2018 06:22:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=m3/MBPOttSbrLuHzH4p2mWwyntvsGOYaNTU52my93DM=; b=VURtStsbmg8DIUrYVrUtzltZAT+j7yDVgLLi96iY14EUwenqutXzGov0So6FTXPVLl K6UjEvNG6PXFEzMVJjrAeOYFMBmWK5bfpXzV9XfkDbH9Xdy50cV/r6rfnTOTCPz/k3RR uc+PqGGYE57D4x59IsAMn2DPkSWIAHBqIv7TLN+KNGhRkT2b1ZgqF+aGr/2OAUdHee+3 lFR8EEOX3rBwoIndIWNhYb2dVVDbYN4NQrFA/T046rMOWtJarv5m2vQVj8JgGJGSlXlR xQFB+ZsLPbPtub9tzT6e0iyWrnPvOPTYVR0eGCmcxH3PPYF9i4gP2fEoBk3v5bDJNfU5 GhLQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=m3/MBPOttSbrLuHzH4p2mWwyntvsGOYaNTU52my93DM=; b=Ok9m6MTRRvjfosFwKFJQvvvLZNfmldD7hN46cGpCgr/zyGuPuOXnypcgj9LA0r2bt2 xGo5GXa0KPBPPHr6jITvbWleZkeojaYSEvSksxGEUMEPVOnlEyOzZ5WbhPWwP6eJDNv6 40eVZZfl5GItNm9eqifBf6Qw7vwA0f82RfVsn/I2J298I0BRA1kbNs9LYrmjcKw3lO4l Bdjaes3bzRw+EsKmFPHItds1XLjHOuZtrEOifmXc7N3MzLq6dyjl/t5j3dRhqxqID+rC LCUmlb/v7aQ7LKuMRD0g6VL2Bjw582XEWbQKK2OfuXY9B3hwqi3CyqbK//iFVr0kMHfe yIWQ== X-Gm-Message-State: ALQs6tAAlUWpFIIzuy1f3H0py2NSFUF01swZteijqqyfifMHlCstznRg YouxACUmrXPD5sQyvQCH/QatW3SJ X-Google-Smtp-Source: AIpwx48fKZhbsqYgbiGxbKtCxUokaYifQZvFq18MKv0NJlWm9P/0wo/xpXI5e1Lx3tydIhoKz0uDFQ== X-Received: by 10.28.91.209 with SMTP id p200mr3445086wmb.11.1523625778561; Fri, 13 Apr 2018 06:22:58 -0700 (PDT) Received: from bidouze.dev.6wind.com. (host.78.145.23.62.rev.coltfrance.com. [62.23.145.78]) by smtp.gmail.com with ESMTPSA id r200sm2377244wmb.9.2018.04.13.06.22.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 13 Apr 2018 06:22:57 -0700 (PDT) From: Gaetan Rivet To: dev@dpdk.org Cc: Gaetan Rivet Date: Fri, 13 Apr 2018 15:22:16 +0200 Message-Id: <26f020df392dcaa7f50dce1048af9526bf4cb8ab.1523625524.git.gaetan.rivet@6wind.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: References: In-Reply-To: References: Subject: [dpdk-dev] [PATCH v6 01/22] kvargs: build before EAL 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: Fri, 13 Apr 2018 13:22:59 -0000 Signed-off-by: Gaetan Rivet --- lib/Makefile | 3 +-- lib/librte_eal/common/Makefile | 2 +- lib/librte_kvargs/Makefile | 3 ++- lib/librte_kvargs/rte_kvargs.c | 2 +- lib/{librte_eal/common/include => librte_kvargs}/rte_string_fns.h | 0 5 files changed, 5 insertions(+), 5 deletions(-) rename lib/{librte_eal/common/include => librte_kvargs}/rte_string_fns.h (100%) diff --git a/lib/Makefile b/lib/Makefile index ec965a606..fc7a55a37 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -4,6 +4,7 @@ include $(RTE_SDK)/mk/rte.vars.mk DIRS-y += librte_compat +DIRS-$(CONFIG_RTE_LIBRTE_KVARGS) += librte_kvargs DIRS-$(CONFIG_RTE_LIBRTE_EAL) += librte_eal DIRS-$(CONFIG_RTE_LIBRTE_PCI) += librte_pci DEPDIRS-librte_pci := librte_eal @@ -71,8 +72,6 @@ DEPDIRS-librte_flow_classify := librte_net librte_table librte_acl DIRS-$(CONFIG_RTE_LIBRTE_SCHED) += librte_sched DEPDIRS-librte_sched := librte_eal librte_mempool librte_mbuf librte_net DEPDIRS-librte_sched += librte_timer -DIRS-$(CONFIG_RTE_LIBRTE_KVARGS) += librte_kvargs -DEPDIRS-librte_kvargs := librte_eal DIRS-$(CONFIG_RTE_LIBRTE_DISTRIBUTOR) += librte_distributor DEPDIRS-librte_distributor := librte_eal librte_mbuf librte_ether DIRS-$(CONFIG_RTE_LIBRTE_PORT) += librte_port diff --git a/lib/librte_eal/common/Makefile b/lib/librte_eal/common/Makefile index 48f870f24..dbd19331b 100644 --- a/lib/librte_eal/common/Makefile +++ b/lib/librte_eal/common/Makefile @@ -9,7 +9,7 @@ INC += rte_errno.h rte_launch.h rte_lcore.h INC += rte_log.h rte_memory.h rte_memzone.h INC += rte_per_lcore.h rte_random.h INC += rte_tailq.h rte_interrupts.h rte_alarm.h -INC += rte_string_fns.h rte_version.h +INC += rte_version.h INC += rte_eal_memconfig.h rte_malloc_heap.h INC += rte_hexdump.h rte_devargs.h rte_bus.h rte_dev.h INC += rte_pci_dev_feature_defs.h rte_pci_dev_features.h diff --git a/lib/librte_kvargs/Makefile b/lib/librte_kvargs/Makefile index 4eaa9334d..e026ecc21 100644 --- a/lib/librte_kvargs/Makefile +++ b/lib/librte_kvargs/Makefile @@ -37,7 +37,7 @@ include $(RTE_SDK)/mk/rte.vars.mk LIB = librte_kvargs.a CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3 -LDLIBS += -lrte_eal +CFLAGS += -I$(RTE_SDK)/lib/librte_eal/common/include EXPORT_MAP := rte_kvargs_version.map @@ -48,6 +48,7 @@ SRCS-$(CONFIG_RTE_LIBRTE_KVARGS) := rte_kvargs.c # install includes INCS := rte_kvargs.h +INCS += rte_string_fns.h SYMLINK-$(CONFIG_RTE_LIBRTE_KVARGS)-include := $(INCS) include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_kvargs/rte_kvargs.c b/lib/librte_kvargs/rte_kvargs.c index d92a5f9dc..0a1abf579 100644 --- a/lib/librte_kvargs/rte_kvargs.c +++ b/lib/librte_kvargs/rte_kvargs.c @@ -7,8 +7,8 @@ #include #include -#include +#include "rte_string_fns.h" #include "rte_kvargs.h" /* diff --git a/lib/librte_eal/common/include/rte_string_fns.h b/lib/librte_kvargs/rte_string_fns.h similarity index 100% rename from lib/librte_eal/common/include/rte_string_fns.h rename to lib/librte_kvargs/rte_string_fns.h -- 2.11.0