From 4448a202b61e1a373c647aa4638093d092b3f5de Mon Sep 17 00:00:00 2001 From: Thomas Monjalon Date: Fri, 27 Mar 2020 02:15:33 +0100 Subject: [PATCH] eal: remove useless makefiles When moving files to the directory kernel/, the file BSDmakefile.meson was left in eal/. Also the intermediate makefiles in linux/ and freebsd/ became useless. Fixes: acaa9ee991b5 ("move kernel modules directories") Cc: stable@dpdk.org Signed-off-by: Thomas Monjalon Acked-by: Bruce Richardson Acked-by: David Marchand --- MAINTAINERS | 1 - lib/librte_eal/Makefile | 4 ++-- lib/librte_eal/freebsd/BSDmakefile.meson | 14 -------------- lib/librte_eal/freebsd/Makefile | 8 -------- lib/librte_eal/linux/Makefile | 11 ----------- 5 files changed, 2 insertions(+), 36 deletions(-) delete mode 100644 lib/librte_eal/freebsd/BSDmakefile.meson delete mode 100644 lib/librte_eal/freebsd/Makefile delete mode 100644 lib/librte_eal/linux/Makefile diff --git a/MAINTAINERS b/MAINTAINERS index db235c2ccf..a3f1a53c4e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -126,7 +126,6 @@ F: doc/guides/prog_guide/ext_app_lib_make_help.rst Meson build M: Bruce Richardson F: meson.build -F: lib/librte_eal/freebsd/BSDmakefile.meson F: meson_options.txt F: config/rte_config.h F: buildtools/call-sphinx-build.py diff --git a/lib/librte_eal/Makefile b/lib/librte_eal/Makefile index 86434f5b31..9c383d42bd 100644 --- a/lib/librte_eal/Makefile +++ b/lib/librte_eal/Makefile @@ -4,9 +4,9 @@ include $(RTE_SDK)/mk/rte.vars.mk DIRS-y += common -DIRS-$(CONFIG_RTE_EXEC_ENV_LINUX) += linux +DIRS-$(CONFIG_RTE_EXEC_ENV_LINUX) += linux/eal DEPDIRS-linux := common -DIRS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += freebsd +DIRS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += freebsd/eal DEPDIRS-freebsd := common include $(RTE_SDK)/mk/rte.subdir.mk diff --git a/lib/librte_eal/freebsd/BSDmakefile.meson b/lib/librte_eal/freebsd/BSDmakefile.meson deleted file mode 100644 index 53c4e79c61..0000000000 --- a/lib/librte_eal/freebsd/BSDmakefile.meson +++ /dev/null @@ -1,14 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Intel Corporation. - -# makefile for building kernel modules using meson -# takes parameters from the environment - -# source file is passed via KMOD_SRC as full path, we only use final -# component of it, as VPATH is used to find actual file, so as to -# have the .o files placed in the build, not source directory -VPATH = ${KMOD_SRC:H} -SRCS = ${KMOD_SRC:T} device_if.h bus_if.h pci_if.h -CFLAGS += $(KMOD_CFLAGS) - -.include diff --git a/lib/librte_eal/freebsd/Makefile b/lib/librte_eal/freebsd/Makefile deleted file mode 100644 index fc42058b6b..0000000000 --- a/lib/librte_eal/freebsd/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -DIRS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal - -include $(RTE_SDK)/mk/rte.subdir.mk diff --git a/lib/librte_eal/linux/Makefile b/lib/librte_eal/linux/Makefile deleted file mode 100644 index 4c68bd61b8..0000000000 --- a/lib/librte_eal/linux/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -include $(RTE_SDK)/mk/rte.vars.mk - -DIRS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal -DEPDIRS-kni := eal - -CFLAGS += -DALLOW_EXPERIMENTAL_API - -include $(RTE_SDK)/mk/rte.subdir.mk -- 2.20.1