From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 990B4A057C; Fri, 27 Mar 2020 02:17:42 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 6C5111C0AE; Fri, 27 Mar 2020 02:17:15 +0100 (CET) Received: from out4-smtp.messagingengine.com (out4-smtp.messagingengine.com [66.111.4.28]) by dpdk.org (Postfix) with ESMTP id 3A7861C0D0 for ; Fri, 27 Mar 2020 02:17:14 +0100 (CET) Received: from compute7.internal (compute7.nyi.internal [10.202.2.47]) by mailout.nyi.internal (Postfix) with ESMTP id D23BE5C01CF; Thu, 26 Mar 2020 21:17:13 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute7.internal (MEProxy); Thu, 26 Mar 2020 21:17:13 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monjalon.net; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=mesmtp; bh=Aa8rfUgAZW 3Il/z8O3L2XT48R6sIxlKy98LSWCflxYw=; b=pfuHKIboCHQo8kBb2UNgHJwarQ 3bHBUFv+4TAtwmVqxzRnvWOHSfjvUxp5I3VQnF3dhRr/j2jIKU/wQ3Cd67TKeyH0 JvghucotZm5Us2S60AvOAyTX7jH4G2UOD5KDFcbUWReDD0Z/wBc/CPNj4MwlFUgV 09K+/YdGIlWDwhI64= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; bh=Aa8rfUgAZW3Il/z8O3L2XT48R6sIxlKy98LSWCflxYw=; b=MOc3gaK4 IXlA0NV64smf2rEWcXXkMCnWSC27S1nbe2gTdClwdAA4IrD6SCNI6lMvp4XXaKTz EmbUMD7LFT86OMwE66CzhbP3iRLf1cw4BrDLAFwSu9wj9r1v3A/eJOBsSikoHspF JIEhS2gzNRzNIa9YaQQIdorzTb+XwUf/P/ugCM/+ZMFLKvFutCPPuq383mrBVnKi tq1MK9uufbHjHFaP/BqaHHZdS2Xf2k9L9m6TPgwYYVSse/LA3xNK9/ueMDx1RolM aCkWNNpHv0Wwm3tIyQeeftOzkcR7QYa3iHArVyIdJolwipAanbWUgwA2tHr36Z94 ejtlt1rsbOL2ig== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedugedrudehjedgudefudcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpefhvffufffkofgjfhgggfestdekredtredttdenucfhrhhomhepvfhhohhm rghsucfoohhnjhgrlhhonhcuoehthhhomhgrshesmhhonhhjrghlohhnrdhnvghtqeenuc ffohhmrghinhepvhgrrhhsrdhmkhenucfkphepjeejrddufeegrddvtdefrddukeegnecu vehluhhsthgvrhfuihiivgepudenucfrrghrrghmpehmrghilhhfrhhomhepthhhohhmrg hssehmohhnjhgrlhhonhdrnhgvth X-ME-Proxy: Received: from xps.monjalon.net (184.203.134.77.rev.sfr.net [77.134.203.184]) by mail.messagingengine.com (Postfix) with ESMTPA id 3E3D3306B11D; Thu, 26 Mar 2020 21:17:13 -0400 (EDT) From: Thomas Monjalon To: dev@dpdk.org Cc: david.marchand@redhat.com, Bruce Richardson Date: Fri, 27 Mar 2020 02:15:40 +0100 Message-Id: <20200327011540.954014-9-thomas@monjalon.net> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200327011540.954014-1-thomas@monjalon.net> References: <20200320001220.150235-1-thomas@monjalon.net> <20200327011540.954014-1-thomas@monjalon.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH v2 8/8] eal: clean make and meson files 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: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Clean up indent and line ordering in Makefile and meson.build for consistency in linux/ and freebsd/ directories. Signed-off-by: Thomas Monjalon --- lib/librte_eal/freebsd/Makefile | 2 +- lib/librte_eal/freebsd/meson.build | 25 ++++++++++++------------ lib/librte_eal/linux/Makefile | 5 ++--- lib/librte_eal/linux/meson.build | 31 +++++++++++++++--------------- 4 files changed, 32 insertions(+), 31 deletions(-) diff --git a/lib/librte_eal/freebsd/Makefile b/lib/librte_eal/freebsd/Makefile index 952f4f1c81..e5d4d8ff26 100644 --- a/lib/librte_eal/freebsd/Makefile +++ b/lib/librte_eal/freebsd/Makefile @@ -6,8 +6,8 @@ include $(RTE_SDK)/mk/rte.vars.mk LIB = librte_eal.a ARCH_DIR ?= $(RTE_ARCH) -VPATH += $(RTE_SDK)/lib/librte_eal/common VPATH += $(RTE_SDK)/lib/librte_eal/$(ARCH_DIR) +VPATH += $(RTE_SDK)/lib/librte_eal/common CFLAGS += -DALLOW_EXPERIMENTAL_API CFLAGS += -I$(SRCDIR)/include diff --git a/lib/librte_eal/freebsd/meson.build b/lib/librte_eal/freebsd/meson.build index 5e6afd9d34..22fc4e8074 100644 --- a/lib/librte_eal/freebsd/meson.build +++ b/lib/librte_eal/freebsd/meson.build @@ -3,18 +3,19 @@ subdir('include') -sources += files('eal_alarm.c', - 'eal_cpuflags.c', - 'eal_debug.c', - 'eal_hugepage_info.c', - 'eal_interrupts.c', - 'eal_lcore.c', - 'eal_memalloc.c', - 'eal_thread.c', - 'eal_timer.c', - 'eal.c', - 'eal_memory.c', - 'eal_dev.c' +sources += files( + 'eal.c', + 'eal_alarm.c', + 'eal_cpuflags.c', + 'eal_debug.c', + 'eal_dev.c', + 'eal_hugepage_info.c', + 'eal_interrupts.c', + 'eal_lcore.c', + 'eal_memalloc.c', + 'eal_memory.c', + 'eal_thread.c', + 'eal_timer.c', ) deps += ['kvargs'] diff --git a/lib/librte_eal/linux/Makefile b/lib/librte_eal/linux/Makefile index 82c3fc570a..e5f44959c6 100644 --- a/lib/librte_eal/linux/Makefile +++ b/lib/librte_eal/linux/Makefile @@ -6,10 +6,7 @@ include $(RTE_SDK)/mk/rte.vars.mk LIB = librte_eal.a ARCH_DIR ?= $(RTE_ARCH) - -EXPORT_MAP := ../rte_eal_version.map VPATH += $(RTE_SDK)/lib/librte_eal/$(ARCH_DIR) - VPATH += $(RTE_SDK)/lib/librte_eal/common CFLAGS += -DALLOW_EXPERIMENTAL_API @@ -27,6 +24,8 @@ ifeq ($(CONFIG_RTE_EAL_NUMA_AWARE_HUGEPAGES),y) LDLIBS += -lnuma endif +EXPORT_MAP := ../rte_eal_version.map + # specific to linux exec-env SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) := eal.c SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_cpuflags.c diff --git a/lib/librte_eal/linux/meson.build b/lib/librte_eal/linux/meson.build index 0e959272df..ca4f4e9785 100644 --- a/lib/librte_eal/linux/meson.build +++ b/lib/librte_eal/linux/meson.build @@ -3,21 +3,22 @@ subdir('include') -sources += files('eal_alarm.c', - 'eal_cpuflags.c', - 'eal_debug.c', - 'eal_hugepage_info.c', - 'eal_interrupts.c', - 'eal_memalloc.c', - 'eal_lcore.c', - 'eal_log.c', - 'eal_thread.c', - 'eal_timer.c', - 'eal_vfio.c', - 'eal_vfio_mp_sync.c', - 'eal.c', - 'eal_memory.c', - 'eal_dev.c', +sources += files( + 'eal.c', + 'eal_alarm.c', + 'eal_cpuflags.c', + 'eal_debug.c', + 'eal_dev.c', + 'eal_hugepage_info.c', + 'eal_interrupts.c', + 'eal_lcore.c', + 'eal_log.c', + 'eal_memalloc.c', + 'eal_memory.c', + 'eal_thread.c', + 'eal_timer.c', + 'eal_vfio.c', + 'eal_vfio_mp_sync.c', ) deps += ['kvargs'] -- 2.25.1