From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm0-f67.google.com (mail-wm0-f67.google.com [74.125.82.67]) by dpdk.org (Postfix) with ESMTP id E87776CA2 for ; Tue, 27 Mar 2018 01:19:08 +0200 (CEST) Received: by mail-wm0-f67.google.com with SMTP id o23so7162432wmf.0 for ; Mon, 26 Mar 2018 16:19:08 -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=CgKKmipA1tNuGAj6nvyOIrvn4jPcm6jNxU8grKTndsY=; b=cNcJg1RWaoNM2nrYcdTnP6Tlsfh2+MTUn/TXLtiH2aTQgwiD5fIEiaYo9EBK7yH8R2 IFYL8CDQqbTx7T4ifMRkc6hg4oTgqBqa62PZoNFDG31ikwn2cd480nvKH7yMRqXfd7of fgF0fXDjjW69/S1d7uKRIDfoMvWeKh0r4F9b/eIAbrSkGqLsYmHBR05b7+jRhtgRF/MM iqlskbck/PE2y6LRGcrQzBY7UfvAjaGuZ8XZ0b/q1qjpx0uE3jLiAvFp1Gg05+5FQv9g dQHuYxUHhii4BlY4Zelxb3pgo+iKM+NB9DnjwG2udXrTaLN892QMYesX46301ZoKHWXY J3pg== 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=CgKKmipA1tNuGAj6nvyOIrvn4jPcm6jNxU8grKTndsY=; b=J+HtW+1F+7KJSWMNNbaWdbOHuFuc5hBXHv848zOxJQ2PxqXfzXGtvs9vuH4Gj4AAuC n8DRgMuzW9ZtPu/n1Cx72G8u9RIZGnjqNEWiC67q2WnVosIbg4CNaad9tSLmUd+M82uu XNHrIZlgFUCBgFwU/14wcT61HKyvKpWDJrAB5de39ImLXeq9Oa6n01IEgUk4vgYwA44A ZcMeM/DFYDV5JDrVptltY9ZzkYtZTtZkpwABM0fE97yl1q7can+QrxJOJ2UrOjwJpKbH crIQ70ImLOWA9UswoM38ecDBfAyv8FDa8sv8ZwTZNb5QXaz9gHuNCFjuo9X9qBu7U/cf iyPw== X-Gm-Message-State: AElRT7H8pIw59r4np1PY8iMyrrCiQZRmK7XpUEcI+8tDUPck/9kUBHP3 3nv6dJ6y+1flNyWTF8lTGb2atv9s X-Google-Smtp-Source: AG47ELvn6CUDxge7t1X01iyYSNwdiLsaJ5kF/kaMsLPg4FaVGdlC0rfQZF5Gy8RqVtdHB/J+IYBDhQ== X-Received: by 10.28.232.200 with SMTP id f69mr16082736wmi.32.1522106347155; Mon, 26 Mar 2018 16:19:07 -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 67sm343712wra.9.2018.03.26.16.19.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 26 Mar 2018 16:19:06 -0700 (PDT) From: Gaetan Rivet To: dev@dpdk.org Cc: Gaetan Rivet Date: Tue, 27 Mar 2018 01:18:26 +0200 Message-Id: <996543406679ba5e61341a71c030f06dd83f4ccf.1522105876.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 v3 02/20] 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: Mon, 26 Mar 2018 23:19:09 -0000 Signed-off-by: Gaetan Rivet --- lib/Makefile | 3 +-- lib/librte_eal/common/Makefile | 2 +- lib/librte_kvargs/Makefile | 2 +- lib/librte_kvargs/rte_kvargs.c | 3 +-- lib/{librte_eal/common/include => librte_kvargs}/rte_string_fns.h | 0 5 files changed, 4 insertions(+), 6 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 ea824a3a8..75776d3e2 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..43e28fc53 100644 --- a/lib/librte_kvargs/Makefile +++ b/lib/librte_kvargs/Makefile @@ -37,7 +37,6 @@ include $(RTE_SDK)/mk/rte.vars.mk LIB = librte_kvargs.a CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3 -LDLIBS += -lrte_eal EXPORT_MAP := rte_kvargs_version.map @@ -48,6 +47,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 d6b187aac..e73a5c6c1 100644 --- a/lib/librte_kvargs/rte_kvargs.c +++ b/lib/librte_kvargs/rte_kvargs.c @@ -7,8 +7,7 @@ #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