DPDK patches and discussions
 help / color / Atom feed
From: Thomas Monjalon <thomas@monjalon.net>
To: dev@dpdk.org
Cc: david.marchand@redhat.com, Bruce Richardson <bruce.richardson@intel.com>
Subject: [dpdk-dev] [PATCH v2 8/8] eal: clean make and meson files
Date: Fri, 27 Mar 2020 02:15:40 +0100
Message-ID: <20200327011540.954014-9-thomas@monjalon.net> (raw)
In-Reply-To: <20200327011540.954014-1-thomas@monjalon.net>

Clean up indent and line ordering in Makefile and meson.build
for consistency in linux/ and freebsd/ directories.

Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
---
 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


  parent reply index

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-03-20  0:12 [dpdk-dev] [PATCH] eal: reorganize directories layout Thomas Monjalon
2020-03-20  9:34 ` Bruce Richardson
2020-03-20 11:46   ` Thomas Monjalon
2020-03-27  1:15 ` [dpdk-dev] [PATCH v2 0/8] " Thomas Monjalon
2020-03-27  1:15   ` [dpdk-dev] [PATCH v2 1/8] eal: remove useless makefiles Thomas Monjalon
2020-03-27 12:05     ` Bruce Richardson
2020-03-27  1:15   ` [dpdk-dev] [PATCH v2 2/8] build: rename ppc sub-directories Thomas Monjalon
2020-03-27 17:49     ` David Christensen
2020-03-27  1:15   ` [dpdk-dev] [PATCH v2 3/8] eal: move arch-specific C files Thomas Monjalon
2020-03-27 17:46     ` David Christensen
2020-03-27  1:15   ` [dpdk-dev] [PATCH v2 4/8] eal: move arch-specific header files Thomas Monjalon
2020-03-27  2:39     ` Gavin Hu
2020-03-27 17:47     ` David Christensen
2020-03-27  1:15   ` [dpdk-dev] [PATCH v2 5/8] eal: simplify meson build of common directory Thomas Monjalon
2020-03-27  1:15   ` [dpdk-dev] [PATCH v2 6/8] eal: move common header files Thomas Monjalon
2020-03-30 13:25     ` David Marchand
2020-03-27  1:15   ` [dpdk-dev] [PATCH v2 7/8] eal: move OS-specific sub-directories Thomas Monjalon
2020-03-27  1:15   ` Thomas Monjalon [this message]
2020-03-27 14:47   ` [dpdk-dev] [PATCH v2 0/8] eal: reorganize directories layout Stephen Hemminger
2020-03-27 15:12     ` Thomas Monjalon
2020-03-30 14:22   ` David Marchand
2020-03-31 11:13     ` David Marchand

Reply instructions:

You may reply publically to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200327011540.954014-9-thomas@monjalon.net \
    --to=thomas@monjalon.net \
    --cc=bruce.richardson@intel.com \
    --cc=david.marchand@redhat.com \
    --cc=dev@dpdk.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

DPDK patches and discussions

Archives are clonable:
	git clone --mirror http://inbox.dpdk.org/dev/0 dev/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 dev dev/ http://inbox.dpdk.org/dev \
		dev@dpdk.org
	public-inbox-index dev


Newsgroup available over NNTP:
	nntp://inbox.dpdk.org/inbox.dpdk.dev


AGPL code for this site: git clone https://public-inbox.org/ public-inbox