[dpdk-dev] [PATCH v2 8/8] eal: clean make and meson files
Thomas Monjalon
thomas at monjalon.net
Fri Mar 27 02:15:40 CET 2020
Clean up indent and line ordering in Makefile and meson.build
for consistency in linux/ and freebsd/ directories.
Signed-off-by: Thomas Monjalon <thomas at 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
More information about the dev
mailing list