[20.11,02/19] build: remove makefiles and mk directory

diff --git a/GNUmakefile b/GNUmakefile
deleted file mode 100644
index e8de422df8..0000000000
--- a/GNUmakefile
+++ /dev/null
@@ -1,17 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2015 Intel Corporation
-
-#
-# Head Makefile for compiling rte SDK
-#
-
-RTE_SDK := $(CURDIR)
-export RTE_SDK
-
-#
-# directory list
-#
-
-ROOTDIRS-y := buildtools lib kernel drivers app
-
-include $(RTE_SDK)/mk/rte.sdkroot.mk
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 571277aa5a..0000000000
--- a/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-.error Error please compile using GNU Make (gmake)
diff --git a/app/Makefile b/app/Makefile
deleted file mode 100644
index 453c4fed6d..0000000000
--- a/app/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-DIRS-$(CONFIG_RTE_APP_TEST) += test
-DIRS-$(CONFIG_RTE_TEST_PMD) += test-pmd
-DIRS-$(CONFIG_RTE_PROC_INFO) += proc-info
-DIRS-$(CONFIG_RTE_LIBRTE_PDUMP) += pdump
-DIRS-$(CONFIG_RTE_LIBRTE_ACL) += test-acl
-DIRS-$(CONFIG_RTE_LIBRTE_CMDLINE) += test-cmdline
-DIRS-$(CONFIG_RTE_LIBRTE_FIB) += test-fib
-DIRS-$(CONFIG_RTE_TEST_FLOW_PERF) += test-flow-perf
-DIRS-$(CONFIG_RTE_LIBRTE_PIPELINE) += test-pipeline
-DIRS-$(CONFIG_RTE_LIBRTE_IPSEC) += test-sad
-DIRS-$(CONFIG_RTE_LIBRTE_REGEXDEV) += test-regex
-
-ifeq ($(CONFIG_RTE_LIBRTE_BBDEV),y)
-DIRS-$(CONFIG_RTE_TEST_BBDEV) += test-bbdev
-endif
-
-ifeq ($(CONFIG_RTE_LIBRTE_COMPRESSDEV),y)
-DIRS-$(CONFIG_RTE_APP_COMPRESS_PERF) += test-compress-perf
-endif
-
-ifeq ($(CONFIG_RTE_LIBRTE_CRYPTODEV),y)
-DIRS-$(CONFIG_RTE_APP_CRYPTO_PERF) += test-crypto-perf
-endif
-
-ifeq ($(CONFIG_RTE_LIBRTE_EVENTDEV),y)
-DIRS-$(CONFIG_RTE_APP_EVENTDEV) += test-eventdev
-endif
-
-include $(RTE_SDK)/mk/rte.subdir.mk
diff --git a/app/pdump/Makefile b/app/pdump/Makefile
deleted file mode 100644
index e6b9eea91b..0000000000
--- a/app/pdump/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2016 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-ifeq ($(CONFIG_RTE_LIBRTE_PDUMP),y)
-
-APP = dpdk-pdump
-
-CFLAGS += $(WERROR_FLAGS)
-
-# all source are stored in SRCS-y
-
-SRCS-y := main.c
-
-include $(RTE_SDK)/mk/rte.app.mk
-
-endif
diff --git a/app/proc-info/Makefile b/app/proc-info/Makefile
deleted file mode 100644
index 214f3f54a1..0000000000
--- a/app/proc-info/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2015 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-APP = dpdk-procinfo
-
-CFLAGS += $(WERROR_FLAGS)
-
-# all source are stored in SRCS-y
-
-SRCS-y := main.c
-
-include $(RTE_SDK)/mk/rte.app.mk
diff --git a/app/test-acl/Makefile b/app/test-acl/Makefile
deleted file mode 100644
index 5f26294cf1..0000000000
--- a/app/test-acl/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-ifeq ($(CONFIG_RTE_LIBRTE_ACL),y)
-
-APP = testacl
-
-CFLAGS += $(WERROR_FLAGS)
-
-# all source are stored in SRCS-y
-SRCS-y := main.c
-
-include $(RTE_SDK)/mk/rte.app.mk
-
-endif
diff --git a/app/test-bbdev/Makefile b/app/test-bbdev/Makefile
deleted file mode 100644
index dc29557f37..0000000000
--- a/app/test-bbdev/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2017 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-#
-# library name
-#
-APP = testbbdev
-
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS)
-
-#
-# all sources are stored in SRCS-y
-#
-SRCS-$(CONFIG_RTE_TEST_BBDEV) += main.c
-SRCS-$(CONFIG_RTE_TEST_BBDEV) += test_bbdev.c
-SRCS-$(CONFIG_RTE_TEST_BBDEV) += test_bbdev_perf.c
-SRCS-$(CONFIG_RTE_TEST_BBDEV) += test_bbdev_vector.c
-
-LDLIBS += -lm
-ifeq ($(CONFIG_RTE_LIBRTE_PMD_BBDEV_FPGA_LTE_FEC),y)
-LDLIBS += -lrte_pmd_bbdev_fpga_lte_fec
-endif
-ifeq ($(CONFIG_RTE_LIBRTE_PMD_BBDEV_FPGA_5GNR_FEC),y)
-LDLIBS += -lrte_pmd_bbdev_fpga_5gnr_fec
-endif
-
-include $(RTE_SDK)/mk/rte.app.mk
diff --git a/app/test-cmdline/Makefile b/app/test-cmdline/Makefile
deleted file mode 100644
index 3e7421906b..0000000000
--- a/app/test-cmdline/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-ifeq ($(CONFIG_RTE_LIBRTE_CMDLINE),y)
-
-#
-# library name
-#
-APP = cmdline_test
-
-#
-# all sources are stored in SRCS-y
-#
-SRCS-y += cmdline_test.c
-SRCS-y += commands.c
-
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS)
-
-include $(RTE_SDK)/mk/rte.app.mk
-
-endif
diff --git a/app/test-compress-perf/Makefile b/app/test-compress-perf/Makefile
deleted file mode 100644
index 2bff531836..0000000000
--- a/app/test-compress-perf/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2018 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-APP = dpdk-test-compress-perf
-
-CFLAGS += $(WERROR_FLAGS)
-CFLAGS += -O3
-
-# all source are stored in SRCS-y
-SRCS-y := main.c
-SRCS-y += comp_perf_options_parse.c
-SRCS-y += comp_perf_test_verify.c
-SRCS-y += comp_perf_test_throughput.c
-SRCS-y += comp_perf_test_cyclecount.c
-SRCS-y += comp_perf_test_common.c
-
-include $(RTE_SDK)/mk/rte.app.mk
diff --git a/app/test-crypto-perf/Makefile b/app/test-crypto-perf/Makefile
deleted file mode 100644
index 0dced790f0..0000000000
--- a/app/test-crypto-perf/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2016-2017 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-
-APP = dpdk-test-crypto-perf
-
-CFLAGS += $(WERROR_FLAGS)
-CFLAGS += -O3
-
-# all source are stored in SRCS-y
-SRCS-y := main.c
-SRCS-y += cperf_ops.c
-SRCS-y += cperf_options_parsing.c
-SRCS-y += cperf_test_vectors.c
-SRCS-y += cperf_test_throughput.c
-SRCS-y += cperf_test_latency.c
-SRCS-y += cperf_test_pmd_cyclecount.c
-SRCS-y += cperf_test_verify.c
-SRCS-y += cperf_test_vector_parsing.c
-SRCS-y += cperf_test_common.c
-
-ifeq ($(CONFIG_RTE_LIBRTE_PMD_CRYPTO_SCHEDULER),y)
-LDLIBS += -lrte_pmd_crypto_scheduler
-endif
-
-include $(RTE_SDK)/mk/rte.app.mk
diff --git a/app/test-eventdev/Makefile b/app/test-eventdev/Makefile
deleted file mode 100644
index e600e21c41..0000000000
--- a/app/test-eventdev/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2017 Cavium, Inc
-#
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-APP = dpdk-test-eventdev
-
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS)
-
-#
-# all source are stored in SRCS-y
-#
-SRCS-y := evt_main.c
-SRCS-y += evt_options.c
-SRCS-y += evt_test.c
-SRCS-y += parser.c
-
-SRCS-y += test_order_common.c
-SRCS-y += test_order_queue.c
-SRCS-y += test_order_atq.c
-
-SRCS-y += test_perf_common.c
-SRCS-y += test_perf_queue.c
-SRCS-y += test_perf_atq.c
-
-SRCS-y += test_pipeline_common.c
-SRCS-y += test_pipeline_queue.c
-SRCS-y += test_pipeline_atq.c
-
-include $(RTE_SDK)/mk/rte.app.mk
diff --git a/app/test-fib/Makefile b/app/test-fib/Makefile
deleted file mode 100644
index 2ea799c0e9..0000000000
--- a/app/test-fib/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-ifeq ($(CONFIG_RTE_LIBRTE_FIB),y)
-
-APP = testfib
-
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS)
-
-# all source are stored in SRCS-y
-SRCS-y := main.c
-
-include $(RTE_SDK)/mk/rte.app.mk
-
-endif
diff --git a/app/test-flow-perf/Makefile b/app/test-flow-perf/Makefile
deleted file mode 100644
index 4f2db75910..0000000000
--- a/app/test-flow-perf/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2020 Mellanox Technologies, Ltd
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-ifeq ($(CONFIG_RTE_TEST_FLOW_PERF),y)
-
-#
-# library name
-#
-APP = dpdk-test-flow-perf
-
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS)
-
-#
-# all source are stored in SRCS-y
-#
-SRCS-y += actions_gen.c
-SRCS-y += flow_gen.c
-SRCS-y += items_gen.c
-SRCS-y += main.c
-
-include $(RTE_SDK)/mk/rte.app.mk
-
-endif
diff --git a/app/test-pipeline/Makefile b/app/test-pipeline/Makefile
deleted file mode 100644
index fc3a504409..0000000000
--- a/app/test-pipeline/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2015 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-ifeq ($(CONFIG_RTE_LIBRTE_PIPELINE),y)
-
-#
-# library name
-#
-APP = testpipeline
-
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS)
-
-#
-# all source are stored in SRCS-y
-#
-SRCS-y := main.c
-SRCS-y += config.c
-SRCS-y += init.c
-SRCS-y += runtime.c
-SRCS-y += pipeline_stub.c
-SRCS-y += pipeline_hash.c
-SRCS-y += pipeline_lpm.c
-SRCS-y += pipeline_lpm_ipv6.c
-
-# include ACL lib if available
-SRCS-$(CONFIG_RTE_LIBRTE_ACL) += pipeline_acl.c
-
-include $(RTE_SDK)/mk/rte.app.mk
-
-endif
diff --git a/app/test-pmd/Makefile b/app/test-pmd/Makefile
deleted file mode 100644
index e739797f8a..0000000000
--- a/app/test-pmd/Makefile
+++ /dev/null
@@ -1,73 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2015 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-ifeq ($(CONFIG_RTE_TEST_PMD),y)
-
-#
-# library name
-#
-APP = testpmd
-
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS)
-CFLAGS += -Wno-deprecated-declarations
-
-#
-# all source are stored in SRCS-y
-#
-SRCS-y := testpmd.c
-SRCS-y += parameters.c
-SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += cmdline.c
-SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += cmdline_flow.c
-SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += cmdline_mtr.c
-SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += cmdline_tm.c
-SRCS-y += config.c
-SRCS-y += iofwd.c
-SRCS-y += macfwd.c
-SRCS-y += macswap.c
-SRCS-y += flowgen.c
-SRCS-y += rxonly.c
-SRCS-y += txonly.c
-SRCS-y += csumonly.c
-SRCS-y += icmpecho.c
-SRCS-y += noisy_vnf.c
-SRCS-y += 5tswap.c
-SRCS-$(CONFIG_RTE_LIBRTE_IEEE1588) += ieee1588fwd.c
-SRCS-$(CONFIG_RTE_LIBRTE_BPF) += bpf_cmd.c
-SRCS-y += util.c
-
-ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y)
-
-ifeq ($(CONFIG_RTE_LIBRTE_PMD_BOND),y)
-LDLIBS += -lrte_pmd_bond
-endif
-
-ifeq ($(CONFIG_RTE_LIBRTE_DPAA_BUS)$(CONFIG_RTE_LIBRTE_DPAA_PMD),yy)
-LDLIBS += -lrte_pmd_dpaa
-LDLIBS += -lrte_bus_dpaa
-LDLIBS += -lrte_mempool_dpaa
-endif
-
-ifeq ($(CONFIG_RTE_LIBRTE_IXGBE_PMD),y)
-LDLIBS += -lrte_pmd_ixgbe
-endif
-
-ifeq ($(CONFIG_RTE_LIBRTE_I40E_PMD),y)
-LDLIBS += -lrte_pmd_i40e
-endif
-
-ifeq ($(CONFIG_RTE_LIBRTE_BNXT_PMD),y)
-LDLIBS += -lrte_pmd_bnxt
-endif
-
-ifeq ($(CONFIG_RTE_LIBRTE_PMD_SOFTNIC),y)
-LDLIBS += -lrte_pmd_softnic
-endif
-
-endif
-
-include $(RTE_SDK)/mk/rte.app.mk
-
-endif
diff --git a/app/test-regex/Makefile b/app/test-regex/Makefile
deleted file mode 100644
index bb8f150871..0000000000
--- a/app/test-regex/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2020 Mellanox Technologies, Ltd
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-APP = dpdk-test-regex
-
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS)
-
-SRCS-y := main.c
-
-include $(RTE_SDK)/mk/rte.app.mk
diff --git a/app/test-sad/Makefile b/app/test-sad/Makefile
deleted file mode 100644
index 9b5a7ddc61..0000000000
--- a/app/test-sad/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-ifeq ($(CONFIG_RTE_LIBRTE_IPSEC),y)
-
-APP = testsad
-
-CFLAGS += $(WERROR_FLAGS)
-
-# all source are stored in SRCS-y
-SRCS-y := main.c
-
-include $(RTE_SDK)/mk/rte.app.mk
-
-endif
diff --git a/app/test/Makefile b/app/test/Makefile
deleted file mode 100644
index f4065271e4..0000000000
--- a/app/test/Makefile
+++ /dev/null
@@ -1,310 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2017 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-ifeq ($(CONFIG_RTE_APP_TEST),y)
-
-# default rule
-all:
-
-# Define an externally linked resource. A linked resource is an arbitrary
-# file that is linked into the test binary. The application refers to this
-# resource by name. The linked generates identifiers beg_<name> and end_<name>
-# for referencing by the C code.
-#
-# Parameters: <unique name>, <file to be linked>
-define linked_resource
-SRCS-y += $(1).res.o
-$(1).res.o: $(2)
-	@  echo '  MKRES $$@'
-	$Q [ "$$(<D)" = . ] || ln -fs $$<
-	$Q $(OBJCOPY) -I binary -B $(RTE_OBJCOPY_ARCH) -O $(RTE_OBJCOPY_TARGET) \
-		--rename-section                                         \
-			.data=.rodata,alloc,load,data,contents,readonly  \
-		--redefine-sym _binary_$$(subst .,_,$$(<F))_start=beg_$(1) \
-		--redefine-sym _binary_$$(subst .,_,$$(<F))_end=end_$(1)   \
-		--redefine-sym _binary_$$(subst .,_,$$(<F))_size=siz_$(1)  \
-		$$(<F) $$@
-endef
-
-ifeq ($(CONFIG_RTE_APP_TEST_RESOURCE_TAR),y)
-define linked_tar_resource
-$(1).tar: $(2)
-	@  echo '  TAR $$@'
-	$Q tar -C $$(dir $$<) -cf $$@ $$(notdir $$<)
-$(call linked_resource,$(1),$(1).tar)
-endef
-else # ! CONFIG_RTE_APP_TEST_RESOURCE_TAR
-linked_tar_resource =
-endif # CONFIG_RTE_APP_TEST_RESOURCE_TAR
-
-#
-# library name
-#
-APP = test
-
-#
-# all sources are stored in SRCS-y
-#
-SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) := commands.c
-SRCS-y += test.c
-SRCS-y += resource.c
-SRCS-y += test_resource.c
-test_resource.res: test_resource.c
-	@ cp $< $@
-$(eval $(call linked_resource,test_resource_c,test_resource.res))
-$(eval $(call linked_tar_resource,test_resource_tar,test_resource.c))
-SRCS-$(CONFIG_RTE_APP_TEST_RESOURCE_TAR) += test_cfgfile.c
-$(eval $(call linked_tar_resource,test_cfgfiles,test_cfgfiles))
-SRCS-y += test_prefetch.c
-SRCS-y += test_byteorder.c
-SRCS-y += test_per_lcore.c
-SRCS-y += test_atomic.c
-SRCS-y += test_barrier.c
-SRCS-y += test_malloc.c
-SRCS-y += test_cycles.c
-SRCS-y += test_mcslock.c
-SRCS-y += test_spinlock.c
-SRCS-y += test_ticketlock.c
-SRCS-y += test_memory.c
-SRCS-y += test_memzone.c
-SRCS-y += test_bitmap.c
-SRCS-y += test_bitops.c
-SRCS-y += test_reciprocal_division.c
-SRCS-y += test_reciprocal_division_perf.c
-SRCS-y += test_fbarray.c
-SRCS-y += test_external_mem.c
-SRCS-y += test_rand_perf.c
-
-SRCS-y += test_ring.c
-SRCS-y += test_ring_mpmc_stress.c
-SRCS-y += test_ring_hts_stress.c
-SRCS-y += test_ring_perf.c
-SRCS-y += test_ring_mt_peek_stress.c
-SRCS-y += test_ring_rts_stress.c
-SRCS-y += test_ring_st_peek_stress.c
-SRCS-y += test_ring_stress.c
-SRCS-y += test_pmd_perf.c
-
-ifeq ($(CONFIG_RTE_LIBRTE_TABLE),y)
-SRCS-y += test_table.c
-SRCS-$(CONFIG_RTE_LIBRTE_PIPELINE) += test_table_pipeline.c
-SRCS-y += test_table_tables.c
-SRCS-y += test_table_ports.c
-SRCS-y += test_table_combined.c
-SRCS-$(CONFIG_RTE_LIBRTE_ACL) += test_table_acl.c
-SRCS-$(CONFIG_RTE_LIBRTE_FLOW_CLASSIFY) += test_flow_classify.c
-endif
-
-SRCS-y += test_rwlock.c
-SRCS-y += test_lcores.c
-
-SRCS-$(CONFIG_RTE_LIBRTE_STACK) += test_stack.c
-SRCS-$(CONFIG_RTE_LIBRTE_STACK) += test_stack_perf.c
-
-SRCS-$(CONFIG_RTE_LIBRTE_TIMER) += test_timer.c
-SRCS-$(CONFIG_RTE_LIBRTE_TIMER) += test_timer_perf.c
-SRCS-$(CONFIG_RTE_LIBRTE_TIMER) += test_timer_racecond.c
-SRCS-$(CONFIG_RTE_LIBRTE_TIMER) += test_timer_secondary.c
-
-SRCS-y += test_mempool.c
-SRCS-y += test_mempool_perf.c
-
-SRCS-y += test_mbuf.c
-SRCS-y += test_logs.c
-
-SRCS-y += test_memcpy.c
-SRCS-y += test_memcpy_perf.c
-
-
-SRCS-$(CONFIG_RTE_LIBRTE_MEMBER) += test_member.c
-SRCS-$(CONFIG_RTE_LIBRTE_MEMBER) += test_member_perf.c
-
-SRCS-$(CONFIG_RTE_LIBRTE_EFD) += test_efd.c
-SRCS-$(CONFIG_RTE_LIBRTE_EFD) += test_efd_perf.c
-
-SRCS-$(CONFIG_RTE_LIBRTE_HASH) += test_hash.c
-SRCS-$(CONFIG_RTE_LIBRTE_HASH) += test_thash.c
-SRCS-$(CONFIG_RTE_LIBRTE_HASH) += test_hash_perf.c
-SRCS-$(CONFIG_RTE_LIBRTE_HASH) += test_hash_functions.c
-SRCS-$(CONFIG_RTE_LIBRTE_HASH) += test_hash_multiwriter.c
-SRCS-$(CONFIG_RTE_LIBRTE_HASH) += test_hash_readwrite.c
-SRCS-$(CONFIG_RTE_LIBRTE_HASH) += test_hash_readwrite_lf_perf.c
-
-SRCS-$(CONFIG_RTE_LIBRTE_RIB) += test_rib.c
-SRCS-$(CONFIG_RTE_LIBRTE_RIB) += test_rib6.c
-SRCS-$(CONFIG_RTE_LIBRTE_FIB) += test_fib.c
-SRCS-$(CONFIG_RTE_LIBRTE_FIB) += test_fib6.c
-SRCS-$(CONFIG_RTE_LIBRTE_FIB) += test_fib_perf.c
-SRCS-$(CONFIG_RTE_LIBRTE_FIB) += test_fib6_perf.c
-
-SRCS-$(CONFIG_RTE_LIBRTE_LPM) += test_lpm.c
-SRCS-$(CONFIG_RTE_LIBRTE_LPM) += test_lpm_perf.c
-SRCS-$(CONFIG_RTE_LIBRTE_LPM) += test_lpm6.c
-SRCS-$(CONFIG_RTE_LIBRTE_LPM) += test_lpm6_perf.c
-
-SRCS-$(CONFIG_RTE_LIBRTE_TELEMETRY) += test_telemetry_json.c
-
-SRCS-y += test_debug.c
-SRCS-y += test_errno.c
-SRCS-y += test_tailq.c
-SRCS-y += test_string_fns.c
-SRCS-y += test_cpuflags.c
-SRCS-y += test_mp_secondary.c
-SRCS-y += test_eal_flags.c
-SRCS-y += test_eal_fs.c
-SRCS-y += test_alarm.c
-SRCS-y += test_interrupts.c
-SRCS-y += test_version.c
-SRCS-y += test_func_reentrancy.c
-SRCS-y += test_trace.c
-SRCS-y += test_trace_register.c
-SRCS-y += test_trace_perf.c
-SRCS-y += test_service_cores.c
-
-ifeq ($(CONFIG_RTE_LIBRTE_PMD_RING),y)
-SRCS-y += sample_packet_forward.c
-SRCS-$(CONFIG_RTE_LIBRTE_BITRATE) += test_bitratestats.c
-SRCS-$(CONFIG_RTE_LIBRTE_LATENCY_STATS) += test_latencystats.c
-SRCS-$(CONFIG_RTE_LIBRTE_PDUMP) += test_pdump.c
-endif
-
-SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += test_cmdline.c
-SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += test_cmdline_num.c
-SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += test_cmdline_etheraddr.c
-SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += test_cmdline_portlist.c
-SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += test_cmdline_ipaddr.c
-SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += test_cmdline_cirbuf.c
-SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += test_cmdline_string.c
-SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += test_cmdline_lib.c
-
-SRCS-$(CONFIG_RTE_LIBRTE_NET) += test_crc.c
-
-ifeq ($(CONFIG_RTE_LIBRTE_SCHED),y)
-SRCS-y += test_red.c
-SRCS-y += test_sched.c
-endif
-
-SRCS-$(CONFIG_RTE_LIBRTE_METER) += test_meter.c
-SRCS-$(CONFIG_RTE_LIBRTE_KNI) += test_kni.c
-SRCS-$(CONFIG_RTE_LIBRTE_POWER) += test_power.c test_power_cpufreq.c
-SRCS-$(CONFIG_RTE_LIBRTE_POWER) += test_power_kvm_vm.c
-SRCS-y += test_common.c
-
-SRCS-$(CONFIG_RTE_LIBRTE_DISTRIBUTOR) += test_distributor.c
-SRCS-$(CONFIG_RTE_LIBRTE_DISTRIBUTOR) += test_distributor_perf.c
-
-SRCS-$(CONFIG_RTE_LIBRTE_REORDER) += test_reorder.c
-
-SRCS-y += virtual_pmd.c
-SRCS-y += packet_burst_generator.c
-SRCS-$(CONFIG_RTE_LIBRTE_ACL) += test_acl.c
-
-ifeq ($(CONFIG_RTE_LIBRTE_PMD_RING),y)
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += test_link_bonding.c
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += test_link_bonding_mode4.c
-endif
-
-ifeq ($(CONFIG_RTE_LIBRTE_PMD_NULL),y)
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += test_link_bonding_rssconf.c
-endif
-
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_RING) += test_pmd_ring.c
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_RING) += test_pmd_ring_perf.c
-
-SRCS-$(CONFIG_RTE_LIBRTE_CRYPTODEV) += test_cryptodev_blockcipher.c
-SRCS-$(CONFIG_RTE_LIBRTE_CRYPTODEV) += test_cryptodev.c
-SRCS-$(CONFIG_RTE_LIBRTE_CRYPTODEV) += test_cryptodev_asym.c
-SRCS-$(CONFIG_RTE_LIBRTE_SECURITY) += test_cryptodev_security_pdcp.c
-
-SRCS-$(CONFIG_RTE_LIBRTE_METRICS) += test_metrics.c
-
-ifeq ($(CONFIG_RTE_COMPRESSDEV_TEST),y)
-SRCS-$(CONFIG_RTE_LIBRTE_COMPRESSDEV) += test_compressdev.c
-endif
-
-ifeq ($(CONFIG_RTE_LIBRTE_EVENTDEV),y)
-SRCS-y += test_eventdev.c
-SRCS-y += test_event_ring.c
-SRCS-y += test_event_eth_rx_adapter.c
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_RING) += test_event_eth_tx_adapter.c
-SRCS-y += test_event_timer_adapter.c
-SRCS-y += test_event_crypto_adapter.c
-endif
-
-ifeq ($(CONFIG_RTE_LIBRTE_GRAPH), y)
-SRCS-y += test_graph.c
-SRCS-y += test_graph_perf.c
-endif
-
-ifeq ($(CONFIG_RTE_LIBRTE_RAWDEV),y)
-SRCS-y += test_rawdev.c
-endif
-
-SRCS-$(CONFIG_RTE_LIBRTE_KVARGS) += test_kvargs.c
-
-SRCS-$(CONFIG_RTE_LIBRTE_BPF) += test_bpf.c
-
-SRCS-$(CONFIG_RTE_LIBRTE_RCU) += test_rcu_qsbr.c test_rcu_qsbr_perf.c
-
-SRCS-$(CONFIG_RTE_LIBRTE_SECURITY) += test_security.c
-
-SRCS-$(CONFIG_RTE_LIBRTE_IPSEC) += test_ipsec.c test_ipsec_perf.c
-SRCS-$(CONFIG_RTE_LIBRTE_IPSEC) += test_ipsec_sad.c
-ifeq ($(CONFIG_RTE_LIBRTE_IPSEC),y)
-LDLIBS += -lrte_ipsec
-endif
-
-CFLAGS += -O3
-# Strict-aliasing rules are violated by uint8_t[] to context size casts.
-CFLAGS += -fno-strict-aliasing
-CFLAGS += $(WERROR_FLAGS)
-
-LDLIBS += -lm
-
-ifeq ($(CONFIG_RTE_LIBRTE_PDUMP),y)
-LDLIBS += -lpthread
-endif
-
-ifeq ($(CONFIG_RTE_COMPRESSDEV_TEST),y)
-ifeq ($(CONFIG_RTE_LIBRTE_COMPRESSDEV),y)
-LDLIBS += -lz
-endif
-endif
-
-# Disable VTA for memcpy test
-ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y)
-ifeq ($(shell test $(GCC_VERSION) -ge 44 && echo 1), 1)
-CFLAGS_test_memcpy.o += -fno-var-tracking-assignments
-CFLAGS_test_memcpy_perf.o += -fno-var-tracking-assignments
-endif
-endif
-
-ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y)
-
-ifeq ($(CONFIG_RTE_LIBRTE_PMD_BOND),y)
-LDLIBS += -lrte_pmd_bond
-endif
-
-ifeq ($(CONFIG_RTE_LIBRTE_PMD_NULL),y)
-LDLIBS += -lrte_pmd_null
-endif
-
-ifeq ($(CONFIG_RTE_LIBRTE_PMD_RING),y)
-LDLIBS += -lrte_pmd_ring
-endif
-
-ifeq ($(CONFIG_RTE_LIBRTE_PMD_CRYPTO_SCHEDULER),y)
-LDLIBS += -lrte_pmd_crypto_scheduler
-endif
-
-endif
-
-ifeq ($(CONFIG_RTE_APP_TEST_RESOURCE_TAR),y)
-LDLIBS += -larchive
-endif
-
-include $(RTE_SDK)/mk/rte.app.mk
-
-endif
diff --git a/buildtools/Makefile b/buildtools/Makefile
deleted file mode 100644
index 7f76fd7d65..0000000000
--- a/buildtools/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2016 Neil Horman <nhorman@tuxdriver.com>
-# All rights reserved.
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-DIRS-y += pmdinfogen
-
-include $(RTE_SDK)/mk/rte.subdir.mk
diff --git a/buildtools/pmdinfogen/Makefile b/buildtools/pmdinfogen/Makefile
deleted file mode 100644
index a97a7648fe..0000000000
--- a/buildtools/pmdinfogen/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2016 Neil Horman <nhorman@tuxdriver.com>
-# All rights reserved.
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-#
-# library name
-#
-HOSTAPP = dpdk-pmdinfogen
-
-#
-# all sources are stored in SRCS-y
-#
-SRCS-y += pmdinfogen.c
-
-HOST_CFLAGS += $(HOST_WERROR_FLAGS) -g
-HOST_CFLAGS += -I$(RTE_OUTPUT)/include
-
-include $(RTE_SDK)/mk/rte.hostapp.mk
diff --git a/drivers/Makefile b/drivers/Makefile
deleted file mode 100644
index 7f06162dc4..0000000000
--- a/drivers/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2015 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-DIRS-y += common
-DIRS-y += bus
-DEPDIRS-bus := common
-DIRS-y += mempool
-DEPDIRS-mempool := common bus
-ifeq ($(findstring y,$(CONFIG_RTE_LIBRTE_MLX5_PMD)$(CONFIG_RTE_LIBRTE_MLX5_VDPA_PMD)$(CONFIG_RTE_LIBRTE_MLX5_REGEX_PMD)),y)
-DIRS-y += common/mlx5
-DEPDIRS-common/mlx5 := bus
-endif
-DIRS-y += net
-DEPDIRS-net := common bus mempool common/mlx5
-DIRS-$(CONFIG_RTE_LIBRTE_BBDEV) += baseband
-DEPDIRS-baseband := common bus mempool
-DIRS-$(CONFIG_RTE_LIBRTE_CRYPTODEV) += crypto
-DEPDIRS-crypto := common bus mempool
-DIRS-$(CONFIG_RTE_LIBRTE_PMD_QAT) += common/qat
-DEPDIRS-common/qat := bus mempool
-DIRS-$(CONFIG_RTE_LIBRTE_COMPRESSDEV) += compress
-DEPDIRS-compress := bus mempool
-DIRS-$(CONFIG_RTE_LIBRTE_REGEXDEV) += regex
-DEPDIRS-regex := common bus common/mlx5
-DIRS-$(CONFIG_RTE_LIBRTE_VHOST) += vdpa
-DEPDIRS-vdpa := common bus mempool common/mlx5
-DIRS-$(CONFIG_RTE_LIBRTE_EVENTDEV) += event
-DEPDIRS-event := common bus mempool net crypto
-DIRS-$(CONFIG_RTE_LIBRTE_RAWDEV) += raw
-DEPDIRS-raw := common bus mempool net event
-
-include $(RTE_SDK)/mk/rte.subdir.mk
diff --git a/drivers/baseband/Makefile b/drivers/baseband/Makefile
deleted file mode 100644
index dcc0969175..0000000000
--- a/drivers/baseband/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2017 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-core-libs := librte_eal librte_mbuf librte_mempool librte_ring
-core-libs += librte_bbdev librte_kvargs librte_cfgfile
-
-DIRS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_NULL) += null
-DEPDIRS-null = $(core-libs)
-DIRS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_TURBO_SW) += turbo_sw
-DEPDIRS-turbo_sw = $(core-libs)
-DIRS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_FPGA_LTE_FEC) += fpga_lte_fec
-DEPDIRS-fpga_lte_fec = $(core-libs)
-DIRS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_FPGA_5GNR_FEC) += fpga_5gnr_fec
-DEPDIRS-fpga_5gnr_fec = $(core-libs)
-
-include $(RTE_SDK)/mk/rte.subdir.mk
diff --git a/drivers/baseband/fpga_5gnr_fec/Makefile b/drivers/baseband/fpga_5gnr_fec/Makefile
deleted file mode 100644
index 7b7017c6dc..0000000000
--- a/drivers/baseband/fpga_5gnr_fec/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2019 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-# library name
-LIB = librte_pmd_bbdev_fpga_5gnr_fec.a
-
-# build flags
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS)
-LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring
-LDLIBS += -lrte_bbdev
-LDLIBS += -lrte_pci -lrte_bus_pci
-
-# versioning export map
-EXPORT_MAP := rte_pmd_bbdev_fpga_5gnr_fec_version.map
-
-# library version
-LIBABIVER := 1
-
-# library source files
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_FPGA_5GNR_FEC) += rte_fpga_5gnr_fec.c
-
-# export include files
-SYMLINK-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_FPGA_5GNR_FEC)-include += rte_pmd_fpga_5gnr_fec.h
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/baseband/fpga_lte_fec/Makefile b/drivers/baseband/fpga_lte_fec/Makefile
deleted file mode 100644
index 30caafe3db..0000000000
--- a/drivers/baseband/fpga_lte_fec/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2019 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-# library name
-LIB = librte_pmd_bbdev_fpga_lte_fec.a
-
-# build flags
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS)
-LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring
-LDLIBS += -lrte_bbdev
-LDLIBS += -lrte_pci -lrte_bus_pci
-
-# versioning export map
-EXPORT_MAP := rte_pmd_bbdev_fpga_lte_fec_version.map
-
-# library source files
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_FPGA_LTE_FEC) += fpga_lte_fec.c
-
-# export include files
-SYMLINK-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_FPGA_LTE_FEC)-include += fpga_lte_fec.h
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/baseband/null/Makefile b/drivers/baseband/null/Makefile
deleted file mode 100644
index 0ee500166d..0000000000
--- a/drivers/baseband/null/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2017 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-# library name
-LIB = librte_pmd_bbdev_null.a
-
-# build flags
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS)
-LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -lrte_kvargs
-LDLIBS += -lrte_bbdev
-LDLIBS += -lrte_bus_vdev
-
-# versioning export map
-EXPORT_MAP := rte_pmd_bbdev_null_version.map
-
-# library source files
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_NULL) += bbdev_null.c
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/baseband/turbo_sw/Makefile b/drivers/baseband/turbo_sw/Makefile
deleted file mode 100644
index c2a6fe0f81..0000000000
--- a/drivers/baseband/turbo_sw/Makefile
+++ /dev/null
@@ -1,52 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2017 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-# library name
-LIB = librte_pmd_bbdev_turbo_sw.a
-
-# build flags
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS)
-LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -lrte_kvargs
-LDLIBS += -lrte_bbdev
-LDLIBS += -lrte_bus_vdev
-
-# versioning export map
-EXPORT_MAP := rte_pmd_bbdev_turbo_sw_version.map
-
-# external library dependencies if available
-ifeq ($(CONFIG_RTE_BBDEV_SDK_AVX2),y)
-ifeq ($(FLEXRAN_SDK),)
-$(error "Please define FLEXRAN_SDK environment variable")
-endif
-CFLAGS += -I$(FLEXRAN_SDK)/lib_common
-CFLAGS += -I$(FLEXRAN_SDK)/lib_turbo
-CFLAGS += -I$(FLEXRAN_SDK)/lib_crc
-CFLAGS += -I$(FLEXRAN_SDK)/lib_rate_matching
-LDLIBS += -L$(FLEXRAN_SDK)/lib_turbo -lturbo
-LDLIBS += -L$(FLEXRAN_SDK)/lib_crc -lcrc
-LDLIBS += -L$(FLEXRAN_SDK)/lib_rate_matching -lrate_matching
-LDLIBS += -L$(FLEXRAN_SDK)/lib_common -lcommon
-LDLIBS += -lstdc++ -lirc -limf -lipps -lsvml
-endif
-
-ifeq ($(CONFIG_RTE_BBDEV_SDK_AVX512),y)
-ifeq ($(CONFIG_RTE_BBDEV_SDK_AVX2),n)
-$(error "CONFIG_RTE_BBDEV_SDK_AVX512 requires CONFIG_RTE_BBDEV_SDK_AVX2 set")
-endif
-CFLAGS += -I$(FLEXRAN_SDK)/lib_ldpc_encoder_5gnr
-CFLAGS += -I$(FLEXRAN_SDK)/lib_ldpc_decoder_5gnr
-CFLAGS += -I$(FLEXRAN_SDK)/lib_LDPC_ratematch_5gnr
-CFLAGS += -I$(FLEXRAN_SDK)/lib_rate_dematching_5gnr
-LDLIBS += -L$(FLEXRAN_SDK)/lib_ldpc_encoder_5gnr -lldpc_encoder_5gnr
-LDLIBS += -L$(FLEXRAN_SDK)/lib_ldpc_decoder_5gnr -lldpc_decoder_5gnr
-LDLIBS += -L$(FLEXRAN_SDK)/lib_LDPC_ratematch_5gnr -lLDPC_ratematch_5gnr
-LDLIBS += -L$(FLEXRAN_SDK)/lib_rate_dematching_5gnr -lrate_dematching_5gnr
-endif
-
-# library source files
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_TURBO_SW) += bbdev_turbo_software.c
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/bus/Makefile b/drivers/bus/Makefile
deleted file mode 100644
index cea3b55e60..0000000000
--- a/drivers/bus/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2016 NXP
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-DIRS-$(CONFIG_RTE_LIBRTE_DPAA_BUS) += dpaa
-ifeq ($(CONFIG_RTE_EAL_VFIO),y)
-DIRS-$(CONFIG_RTE_LIBRTE_FSLMC_BUS) += fslmc
-endif
-DIRS-$(CONFIG_RTE_LIBRTE_IFPGA_BUS) += ifpga
-DIRS-$(CONFIG_RTE_LIBRTE_PCI_BUS) += pci
-DIRS-$(CONFIG_RTE_LIBRTE_VDEV_BUS) += vdev
-DIRS-$(CONFIG_RTE_LIBRTE_VMBUS) += vmbus
-
-include $(RTE_SDK)/mk/rte.subdir.mk
diff --git a/drivers/bus/dpaa/Makefile b/drivers/bus/dpaa/Makefile
deleted file mode 100644
index ba40b21166..0000000000
--- a/drivers/bus/dpaa/Makefile
+++ /dev/null
@@ -1,48 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2016 NXP
-
-include $(RTE_SDK)/mk/rte.vars.mk
-RTE_BUS_DPAA=$(RTE_SDK)/drivers/bus/dpaa
-
-#
-# library name
-#
-LIB = librte_bus_dpaa.a
-
-CFLAGS := -I$(SRCDIR) $(CFLAGS)
-CFLAGS += -O3 $(WERROR_FLAGS)
-CFLAGS += -Wno-pointer-arith
-CFLAGS += -Wno-cast-qual
-CFLAGS += -I$(RTE_BUS_DPAA)/
-CFLAGS += -I$(RTE_BUS_DPAA)/include
-CFLAGS += -I$(RTE_BUS_DPAA)/base/qbman
-CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax
-CFLAGS += -I$(RTE_SDK)/lib/librte_eal/include
-
-# versioning export map
-EXPORT_MAP := rte_bus_dpaa_version.map
-
-# all source are stored in SRCS-y
-#
-SRCS-$(CONFIG_RTE_LIBRTE_DPAA_BUS) += \
-	dpaa_bus.c
-
-SRCS-$(CONFIG_RTE_LIBRTE_DPAA_BUS) += \
-	base/fman/fman.c \
-	base/fman/fman_hw.c \
-	base/fman/netcfg_layer.c \
-	base/qbman/process.c \
-	base/qbman/bman.c \
-	base/qbman/bman_driver.c \
-	base/qbman/qman.c \
-	base/qbman/qman_driver.c \
-	base/qbman/dpaa_alloc.c \
-	base/qbman/dpaa_sys.c
-
-# Link Pthread
-LDLIBS += -lpthread
-LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring
-LDLIBS += -lrte_ethdev
-LDLIBS += -lrte_common_dpaax
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/bus/fslmc/Makefile b/drivers/bus/fslmc/Makefile
deleted file mode 100644
index b98d758ee0..0000000000
--- a/drivers/bus/fslmc/Makefile
+++ /dev/null
@@ -1,47 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2016 NXP
-#
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-#
-# library name
-#
-LIB = librte_bus_fslmc.a
-
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS)
-
-CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc
-CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc/mc
-CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc/qbman/include
-CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax
-CFLAGS += -I$(RTE_SDK)/lib/librte_eal/common
-LDLIBS += -lpthread
-LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring
-LDLIBS += -lrte_ethdev
-LDLIBS += -lrte_common_dpaax
-
-# versioning export map
-EXPORT_MAP := rte_bus_fslmc_version.map
-
-SRCS-$(CONFIG_RTE_LIBRTE_FSLMC_BUS) += \
-        qbman/qbman_portal.c \
-        qbman/qbman_debug.c
-
-SRCS-$(CONFIG_RTE_LIBRTE_FSLMC_BUS) += \
-	mc/dpmng.c \
-	mc/dpbp.c \
-	mc/dpio.c \
-	mc/mc_sys.c \
-	mc/dpcon.c \
-	mc/dpci.c \
-	mc/dpdmai.c
-
-SRCS-$(CONFIG_RTE_LIBRTE_FSLMC_BUS) += portal/dpaa2_hw_dpio.c
-SRCS-$(CONFIG_RTE_LIBRTE_FSLMC_BUS) += portal/dpaa2_hw_dpbp.c
-SRCS-$(CONFIG_RTE_LIBRTE_FSLMC_BUS) += portal/dpaa2_hw_dpci.c
-SRCS-$(CONFIG_RTE_LIBRTE_FSLMC_BUS) += fslmc_vfio.c
-SRCS-$(CONFIG_RTE_LIBRTE_FSLMC_BUS) += fslmc_bus.c
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/bus/ifpga/Makefile b/drivers/bus/ifpga/Makefile
deleted file mode 100644
index 1df369103c..0000000000
--- a/drivers/bus/ifpga/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2018 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-#
-# library name
-#
-LIB = librte_bus_ifpga.a
-
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS)
-LDLIBS += -lrte_eal
-LDLIBS += -lrte_rawdev
-LDLIBS += -lrte_kvargs
-
-# versioning export map
-EXPORT_MAP := rte_bus_ifpga_version.map
-
-SRCS-$(CONFIG_RTE_LIBRTE_IFPGA_BUS) += ifpga_bus.c
-SRCS-$(CONFIG_RTE_LIBRTE_IFPGA_BUS) += ifpga_common.c
-
-#
-# Export include files
-#
-SYMLINK-$(CONFIG_RTE_LIBRTE_IFPGA_BUS)-include += rte_bus_ifpga.h
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/bus/pci/Makefile b/drivers/bus/pci/Makefile
deleted file mode 100644
index f4102d0a7f..0000000000
--- a/drivers/bus/pci/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2017 6WIND S.A.
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-LIB = librte_bus_pci.a
-EXPORT_MAP := rte_bus_pci_version.map
-
-CFLAGS := -I$(SRCDIR) $(CFLAGS)
-CFLAGS += -O3 $(WERROR_FLAGS)
-
-ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),)
-SYSTEM := linux
-endif
-ifneq ($(CONFIG_RTE_EXEC_ENV_FREEBSD),)
-SYSTEM := bsd
-endif
-
-CFLAGS += -I$(RTE_SDK)/drivers/bus/pci/$(SYSTEM)
-CFLAGS += -I$(RTE_SDK)/lib/librte_eal/common
-
-LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring
-LDLIBS += -lrte_pci -lrte_kvargs
-
-include $(RTE_SDK)/drivers/bus/pci/$(SYSTEM)/Makefile
-SRCS-$(CONFIG_RTE_LIBRTE_PCI_BUS) := $(addprefix $(SYSTEM)/,$(SRCS))
-SRCS-$(CONFIG_RTE_LIBRTE_PCI_BUS) += pci_params.c
-SRCS-$(CONFIG_RTE_LIBRTE_PCI_BUS) += pci_common.c
-SRCS-$(CONFIG_RTE_LIBRTE_PCI_BUS) += pci_common_uio.c
-
-SYMLINK-$(CONFIG_RTE_LIBRTE_PCI_BUS)-include += rte_bus_pci.h
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/bus/pci/bsd/Makefile b/drivers/bus/pci/bsd/Makefile
deleted file mode 100644
index c1b54c05ef..0000000000
--- a/drivers/bus/pci/bsd/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2017 6WIND S.A.
-
-SRCS += pci.c
diff --git a/drivers/bus/pci/linux/Makefile b/drivers/bus/pci/linux/Makefile
deleted file mode 100644
index 90404468b0..0000000000
--- a/drivers/bus/pci/linux/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2017 6WIND S.A.
-
-SRCS += pci.c
-SRCS += pci_uio.c
-SRCS += pci_vfio.c
diff --git a/drivers/bus/vdev/Makefile b/drivers/bus/vdev/Makefile
deleted file mode 100644
index 01747f03a4..0000000000
--- a/drivers/bus/vdev/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2017 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-#
-# library name
-#
-LIB = librte_bus_vdev.a
-
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS)
-
-# versioning export map
-EXPORT_MAP := rte_bus_vdev_version.map
-
-SRCS-y += vdev.c
-SRCS-y += vdev_params.c
-
-LDLIBS += -lrte_eal -lrte_kvargs
-
-#
-# Export include files
-#
-SYMLINK-y-include += rte_bus_vdev.h
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/bus/vmbus/Makefile b/drivers/bus/vmbus/Makefile
deleted file mode 100644
index 335df6a0ba..0000000000
--- a/drivers/bus/vmbus/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-LIB = librte_bus_vmbus.a
-EXPORT_MAP := rte_bus_vmbus_version.map
-
-CFLAGS += -I$(SRCDIR)
-CFLAGS += -O3 $(WERROR_FLAGS)
-
-ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),)
-SYSTEM := linux
-endif
-ifneq ($(CONFIG_RTE_EXEC_ENV_FREEBSD),)
-$(error "VMBUS not implemented for BSD yet")
-endif
-
-CFLAGS += -I$(RTE_SDK)/drivers/bus/vmbus/$(SYSTEM)
-CFLAGS += -I$(RTE_SDK)/lib/librte_eal/common
-
-LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring
-LDLIBS += -lrte_ethdev
-
-include $(RTE_SDK)/drivers/bus/vmbus/$(SYSTEM)/Makefile
-SRCS-$(CONFIG_RTE_LIBRTE_VMBUS) := $(addprefix $(SYSTEM)/,$(SRCS))
-SRCS-$(CONFIG_RTE_LIBRTE_VMBUS) += vmbus_common.c
-SRCS-$(CONFIG_RTE_LIBRTE_VMBUS) += vmbus_channel.c vmbus_bufring.c
-SRCS-$(CONFIG_RTE_LIBRTE_VMBUS) += vmbus_common_uio.c
-
-SYMLINK-$(CONFIG_RTE_LIBRTE_VMBUS)-include += rte_bus_vmbus.h
-SYMLINK-$(CONFIG_RTE_LIBRTE_VMBUS)-include += rte_vmbus_reg.h
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/bus/vmbus/linux/Makefile b/drivers/bus/vmbus/linux/Makefile
deleted file mode 100644
index ef0d30b2d3..0000000000
--- a/drivers/bus/vmbus/linux/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-
-SRCS += vmbus_bus.c vmbus_uio.c
diff --git a/drivers/common/Makefile b/drivers/common/Makefile
deleted file mode 100644
index cfb6b4dc88..0000000000
--- a/drivers/common/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2018 Cavium, Inc
-#
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-CPT-y := $(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_CRYPTO)
-CPT-y += $(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_CRYPTO)
-ifneq (,$(findstring y,$(CPT-y)))
-DIRS-y += cpt
-endif
-
-ifeq ($(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_SSOVF)$(CONFIG_RTE_LIBRTE_OCTEONTX_MEMPOOL),yy)
-DIRS-y += octeontx
-endif
-OCTEONTX2-y := $(CONFIG_RTE_LIBRTE_OCTEONTX2_MEMPOOL)
-OCTEONTX2-y += $(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_CRYPTO)
-ifeq ($(findstring y,$(OCTEONTX2-y)),y)
-DIRS-y += octeontx2
-endif
-
-MVEP-y := $(CONFIG_RTE_LIBRTE_MVPP2_PMD)
-MVEP-y += $(CONFIG_RTE_LIBRTE_MVNETA_PMD)
-MVEP-y += $(CONFIG_RTE_LIBRTE_PMD_MVSAM_CRYPTO)
-ifneq (,$(findstring y,$(MVEP-y)))
-DIRS-y += mvep
-endif
-
-ifeq ($(CONFIG_RTE_LIBRTE_COMMON_DPAAX),y)
-DIRS-y += dpaax
-endif
-
-IAVF-y := $(CONFIG_RTE_LIBRTE_IAVF_PMD)
-IAVF-y += $(CONFIG_RTE_LIBRTE_ICE_PMD)
-ifneq (,$(findstring y,$(IAVF-y)))
-DIRS-y += iavf
-endif
-
-include $(RTE_SDK)/mk/rte.subdir.mk
diff --git a/drivers/common/cpt/Makefile b/drivers/common/cpt/Makefile
deleted file mode 100644
index cab9da73c8..0000000000
--- a/drivers/common/cpt/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2018 Cavium, Inc
-#
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-#
-# library name
-#
-LIB = librte_common_cpt.a
-
-CFLAGS += $(WERROR_FLAGS)
-CFLAGS += -I$(RTE_SDK)/drivers/bus/pci
-EXPORT_MAP := rte_common_cpt_version.map
-
-#
-# all source are stored in SRCS-y
-#
-SRCS-y += cpt_fpm_tables.c
-SRCS-y += cpt_pmd_ops_helper.c
-
-LDLIBS += -lrte_eal
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/common/dpaax/Makefile b/drivers/common/dpaax/Makefile
deleted file mode 100644
index 2f4b924fda..0000000000
--- a/drivers/common/dpaax/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2018 NXP
-#
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-#
-# library name
-#
-LIB = librte_common_dpaax.a
-
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS)
-CFLAGS += -Wno-pointer-arith
-CFLAGS += -Wno-cast-qual
-
-CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax
-CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax/caamflib
-
-# versioning export map
-EXPORT_MAP := rte_common_dpaax_version.map
-
-#
-# all source are stored in SRCS-y
-#
-SRCS-y += dpaax_iova_table.c dpaa_of.c caamflib.c
-
-LDLIBS += -lrte_eal
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/common/iavf/Makefile b/drivers/common/iavf/Makefile
deleted file mode 100644
index f06dafd408..0000000000
--- a/drivers/common/iavf/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2019 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-#
-# library name
-#
-LIB = librte_common_iavf.a
-
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS)
-CFLAGS += -Wno-pointer-arith
-CFLAGS += -Wno-cast-qual
-
-EXPORT_MAP := rte_common_iavf_version.map
-
-#
-# all source are stored in SRCS-y
-#
-SRCS-y += iavf_adminq.c
-SRCS-y += iavf_common.c
-SRCS-y += iavf_impl.c
-
-LDLIBS += -lrte_eal
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/common/mlx5/Makefile b/drivers/common/mlx5/Makefile
deleted file mode 100644
index 4edd541042..0000000000
--- a/drivers/common/mlx5/Makefile
+++ /dev/null
@@ -1,404 +0,0 @@ 
-#   SPDX-License-Identifier: BSD-3-Clause
-#   Copyright 2019 Mellanox Technologies, Ltd
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-# Library name.
-LIB = librte_common_mlx5.a
-LIB_GLUE = $(LIB_GLUE_BASE).$(LIB_GLUE_VERSION)
-LIB_GLUE_BASE = librte_pmd_mlx5_glue.so
-LIB_GLUE_VERSION = 20.02.0
-
-# Sources.
-ifeq ($(findstring y,$(CONFIG_RTE_LIBRTE_MLX5_PMD)$(CONFIG_RTE_LIBRTE_MLX5_VDPA_PMD)$(CONFIG_RTE_LIBRTE_MLX5_REGEX_PMD)),y)
-ifneq ($(CONFIG_RTE_IBVERBS_LINK_DLOPEN),y)
-SRCS-y += linux/mlx5_glue.c
-endif
-SRCS-y += mlx5_devx_cmds.c
-SRCS-y += mlx5_common.c
-SRCS-y += linux/mlx5_common_os.c
-SRCS-y += linux/mlx5_nl.c
-SRCS-y += linux/mlx5_common_verbs.c
-SRCS-y += mlx5_common_mp.c
-SRCS-y += mlx5_common_mr.c
-SRCS-y += mlx5_malloc.c
-SRCS-y += mlx5_common_pci.c
-ifeq ($(CONFIG_RTE_IBVERBS_LINK_DLOPEN),y)
-INSTALL-y-lib += $(LIB_GLUE)
-endif
-endif
-
-# Basic CFLAGS.
-CFLAGS += -O3
-CFLAGS += -std=c11 -Wall -Wextra
-CFLAGS += -g
-CFLAGS += -I.
-CFLAGS += -I$(SRCDIR)
-CFLAGS += -I$(SRCDIR)/linux
-CFLAGS += -D_BSD_SOURCE
-CFLAGS += -D_DEFAULT_SOURCE
-CFLAGS += -D_XOPEN_SOURCE=600
-CFLAGS += $(WERROR_FLAGS)
-CFLAGS += -Wno-strict-prototypes
-ifeq ($(CONFIG_RTE_IBVERBS_LINK_DLOPEN),y)
-CFLAGS += -DMLX5_GLUE='"$(LIB_GLUE)"'
-CFLAGS += -DMLX5_GLUE_VERSION='"$(LIB_GLUE_VERSION)"'
-CFLAGS_linux/mlx5_glue.o += -fPIC
-LDLIBS += -ldl
-else ifeq ($(CONFIG_RTE_IBVERBS_LINK_STATIC),y)
-LDLIBS += $(shell $(RTE_SDK)/buildtools/options-ibverbs-static.sh)
-else
-LDLIBS += -libverbs -lmlx5
-endif
-
-LDLIBS += -lrte_eal -lrte_pci -lrte_kvargs -lrte_net
-LDLIBS += -lrte_bus_pci
-
-# A few warnings cannot be avoided in external headers.
-CFLAGS += -Wno-error=cast-qual -UPEDANTIC
-
-EXPORT_MAP := rte_common_mlx5_version.map
-
-include $(RTE_SDK)/mk/rte.lib.mk
-
-# Generate and clean-up mlx5_autoconf.h.
-
-export CC CFLAGS CPPFLAGS EXTRA_CFLAGS EXTRA_CPPFLAGS
-export AUTO_CONFIG_CFLAGS = -Wno-error
-
-ifndef V
-AUTOCONF_OUTPUT := >/dev/null
-endif
-
-mlx5_autoconf.h.new: FORCE
-
-mlx5_autoconf.h.new: $(RTE_SDK)/buildtools/auto-config-h.sh
-	$Q $(RM) -f -- '$@'
-	$Q sh -- '$<' '$@' \
-		HAVE_IBV_RELAXED_ORDERING \
-		infiniband/verbs.h \
-		enum IBV_ACCESS_RELAXED_ORDERING \
-		$(AUTOCONF_OUTPUT)
-	$Q sh -- '$<' '$@' \
-		HAVE_IBV_DEVICE_STRIDING_RQ_SUPPORT \
-		infiniband/mlx5dv.h \
-		enum MLX5DV_CQE_RES_FORMAT_CSUM_STRIDX \
-		$(AUTOCONF_OUTPUT)
-	$Q sh -- '$<' '$@' \
-		HAVE_IBV_DEVICE_TUNNEL_SUPPORT \
-		infiniband/mlx5dv.h \
-		enum MLX5DV_CONTEXT_MASK_TUNNEL_OFFLOADS \
-		$(AUTOCONF_OUTPUT)
-	$Q sh -- '$<' '$@' \
-		HAVE_IBV_DEVICE_MPLS_SUPPORT \
-		infiniband/verbs.h \
-		enum IBV_FLOW_SPEC_MPLS \
-		$(AUTOCONF_OUTPUT)
-	$Q sh -- '$<' '$@' \
-		HAVE_IBV_WQ_FLAGS_PCI_WRITE_END_PADDING \
-		infiniband/verbs.h \
-		enum IBV_WQ_FLAGS_PCI_WRITE_END_PADDING \
-		$(AUTOCONF_OUTPUT)
-	$Q sh -- '$<' '$@' \
-		HAVE_IBV_WQ_FLAG_RX_END_PADDING \
-		infiniband/verbs.h \
-		enum IBV_WQ_FLAG_RX_END_PADDING \
-		$(AUTOCONF_OUTPUT)
-	$Q sh -- '$<' '$@' \
-		HAVE_IBV_MLX5_MOD_SWP \
-		infiniband/mlx5dv.h \
-		type 'struct mlx5dv_sw_parsing_caps' \
-		$(AUTOCONF_OUTPUT)
-	$Q sh -- '$<' '$@' \
-		HAVE_IBV_MLX5_MOD_MPW \
-		infiniband/mlx5dv.h \
-		enum MLX5DV_CONTEXT_FLAGS_MPW_ALLOWED \
-		$(AUTOCONF_OUTPUT)
-	$Q sh -- '$<' '$@' \
-		HAVE_IBV_MLX5_MOD_CQE_128B_COMP \
-		infiniband/mlx5dv.h \
-		enum MLX5DV_CONTEXT_FLAGS_CQE_128B_COMP \
-		$(AUTOCONF_OUTPUT)
-	$Q sh -- '$<' '$@' \
-		HAVE_IBV_MLX5_MOD_CQE_128B_PAD \
-		infiniband/mlx5dv.h \
-		enum MLX5DV_CQ_INIT_ATTR_FLAGS_CQE_PAD \
-		$(AUTOCONF_OUTPUT)
-	$Q sh -- '$<' '$@' \
-		HAVE_IBV_FLOW_DV_SUPPORT \
-		infiniband/mlx5dv.h \
-		func mlx5dv_create_flow_action_packet_reformat \
-		$(AUTOCONF_OUTPUT)
-	$Q sh -- '$<' '$@' \
-		HAVE_MLX5DV_DR \
-		infiniband/mlx5dv.h \
-		enum MLX5DV_DR_DOMAIN_TYPE_NIC_RX \
-		$(AUTOCONF_OUTPUT)
-	$Q sh -- '$<' '$@' \
-		HAVE_MLX5DV_DR_ESWITCH \
-		infiniband/mlx5dv.h \
-		enum MLX5DV_DR_DOMAIN_TYPE_FDB \
-		$(AUTOCONF_OUTPUT)
-	$Q sh -- '$<' '$@' \
-		HAVE_MLX5DV_DR_VLAN \
-		infiniband/mlx5dv.h \
-		func mlx5dv_dr_action_create_push_vlan \
-		$(AUTOCONF_OUTPUT)
-	$Q sh -- '$<' '$@' \
-		HAVE_MLX5DV_DR_DEVX_PORT \
-		infiniband/mlx5dv.h \
-		func mlx5dv_query_devx_port \
-		$(AUTOCONF_OUTPUT)
-	$Q sh -- '$<' '$@' \
-		HAVE_IBV_DEVX_OBJ \
-		infiniband/mlx5dv.h \
-		func mlx5dv_devx_obj_create \
-		$(AUTOCONF_OUTPUT)
-	$Q sh -- '$<' '$@' \
-		HAVE_IBV_FLOW_DEVX_COUNTERS \
-		infiniband/mlx5dv.h \
-		enum MLX5DV_FLOW_ACTION_COUNTERS_DEVX \
-		$(AUTOCONF_OUTPUT)
-	$Q sh -- '$<' '$@' \
-		HAVE_MLX5_DR_CREATE_ACTION_DEFAULT_MISS \
-		infiniband/mlx5dv.h \
-		enum MLX5DV_FLOW_ACTION_DEFAULT_MISS \
-		$(AUTOCONF_OUTPUT)
-	$Q sh -- '$<' '$@' \
-		HAVE_IBV_DEVX_ASYNC \
-		infiniband/mlx5dv.h \
-		func mlx5dv_devx_obj_query_async \
-		$(AUTOCONF_OUTPUT)
-	$Q sh -- '$<' '$@' \
-		HAVE_IBV_DEVX_QP \
-		infiniband/mlx5dv.h \
-		func mlx5dv_devx_qp_query \
-		$(AUTOCONF_OUTPUT)
-	$Q sh -- '$<' '$@' \
-		HAVE_MLX5DV_DEVX_UAR_OFFSET \
-		infiniband/mlx5dv.h \
-		field "struct mlx5dv_devx_uar.mmap_off" \
-		$(AUTOCONF_OUTPUT)
-	$Q sh -- '$<' '$@' \
-		HAVE_MLX5DV_PP_ALLOC \
-		infiniband/mlx5dv.h \
-		func mlx5dv_pp_alloc \
-		$(AUTOCONF_OUTPUT)
-	$Q sh -- '$<' '$@' \
-		HAVE_MLX5DV_DR_ACTION_DEST_DEVX_TIR \
-		infiniband/mlx5dv.h \
-		func mlx5dv_dr_action_create_dest_devx_tir \
-		$(AUTOCONF_OUTPUT)
-	$Q sh -- '$<' '$@' \
-		HAVE_IBV_DEVX_EVENT \
-		infiniband/mlx5dv.h \
-		func mlx5dv_devx_get_event \
-		$(AUTOCONF_OUTPUT)
-	$Q sh -- '$<' '$@' \
-		HAVE_MLX5_DR_CREATE_ACTION_FLOW_METER \
-		infiniband/mlx5dv.h \
-		func mlx5dv_dr_action_create_flow_meter \
-		$(AUTOCONF_OUTPUT)
-	$Q sh -- '$<' '$@' \
-		HAVE_MLX5_DR_FLOW_DUMP \
-		infiniband/mlx5dv.h \
-		func mlx5dv_dump_dr_domain \
-		$(AUTOCONF_OUTPUT)
-	$Q sh -- '$<' '$@' \
-		HAVE_MLX5DV_MMAP_GET_NC_PAGES_CMD \
-		infiniband/mlx5dv.h \
-		enum MLX5_MMAP_GET_NC_PAGES_CMD \
-		$(AUTOCONF_OUTPUT)
-	$Q sh -- '$<' '$@' \
-		HAVE_IBV_VAR \
-		infiniband/mlx5dv.h \
-		func mlx5dv_alloc_var \
-		$(AUTOCONF_OUTPUT)
-	$Q sh -- '$<' '$@' \
-		HAVE_MLX5DV_DR_MEM_RECLAIM \
-		infiniband/mlx5dv.h \
-		func mlx5dv_dr_domain_set_reclaim_device_memory \
-		$(AUTOCONF_OUTPUT)
-	$Q sh -- '$<' '$@' \
-		HAVE_MLX5_OPCODE_ENHANCED_MPSW \
-		infiniband/mlx5dv.h \
-		enum MLX5_OPCODE_ENHANCED_MPSW \
-		$(AUTOCONF_OUTPUT)
-	$Q sh -- '$<' '$@' \
-		HAVE_MLX5_OPCODE_SEND_EN \
-		infiniband/mlx5dv.h \
-		enum MLX5_OPCODE_SEND_EN \
-		$(AUTOCONF_OUTPUT)
-	$Q sh -- '$<' '$@' \
-		HAVE_MLX5_OPCODE_WAIT \
-		infiniband/mlx5dv.h \
-		enum MLX5_OPCODE_WAIT \
-		$(AUTOCONF_OUTPUT)
-	$Q sh -- '$<' '$@' \
-		HAVE_ETHTOOL_LINK_MODE_25G \
-		/usr/include/linux/ethtool.h \
-		enum ETHTOOL_LINK_MODE_25000baseCR_Full_BIT \
-		$(AUTOCONF_OUTPUT)
-	$Q sh -- '$<' '$@' \
-		HAVE_ETHTOOL_LINK_MODE_50G \
-		/usr/include/linux/ethtool.h \
-		enum ETHTOOL_LINK_MODE_50000baseCR2_Full_BIT \
-		$(AUTOCONF_OUTPUT)
-	$Q sh -- '$<' '$@' \
-		HAVE_ETHTOOL_LINK_MODE_100G \
-		/usr/include/linux/ethtool.h \
-		enum ETHTOOL_LINK_MODE_100000baseKR4_Full_BIT \
-		$(AUTOCONF_OUTPUT)
-	$Q sh -- '$<' '$@' \
-		HAVE_IBV_DEVICE_COUNTERS_SET_V42 \
-		infiniband/verbs.h \
-		type 'struct ibv_counter_set_init_attr' \
-		$(AUTOCONF_OUTPUT)
-	$Q sh -- '$<' '$@' \
-		HAVE_IBV_DEVICE_COUNTERS_SET_V45 \
-		infiniband/verbs.h \
-		type 'struct ibv_counters_init_attr' \
-		$(AUTOCONF_OUTPUT)
-	$Q sh -- '$<' '$@' \
-		HAVE_RDMA_NL_NLDEV \
-		rdma/rdma_netlink.h \
-		enum RDMA_NL_NLDEV \
-		$(AUTOCONF_OUTPUT)
-	$Q sh -- '$<' '$@' \
-		HAVE_RDMA_NLDEV_CMD_GET \
-		rdma/rdma_netlink.h \
-		enum RDMA_NLDEV_CMD_GET \
-		$(AUTOCONF_OUTPUT)
-	$Q sh -- '$<' '$@' \
-		HAVE_RDMA_NLDEV_CMD_PORT_GET \
-		rdma/rdma_netlink.h \
-		enum RDMA_NLDEV_CMD_PORT_GET \
-		$(AUTOCONF_OUTPUT)
-	$Q sh -- '$<' '$@' \
-		HAVE_RDMA_NLDEV_ATTR_DEV_INDEX \
-		rdma/rdma_netlink.h \
-		enum RDMA_NLDEV_ATTR_DEV_INDEX \
-		$(AUTOCONF_OUTPUT)
-	$Q sh -- '$<' '$@' \
-		HAVE_RDMA_NLDEV_ATTR_DEV_NAME \
-		rdma/rdma_netlink.h \
-		enum RDMA_NLDEV_ATTR_DEV_NAME \
-		$(AUTOCONF_OUTPUT)
-	$Q sh -- '$<' '$@' \
-		HAVE_RDMA_NLDEV_ATTR_PORT_INDEX \
-		rdma/rdma_netlink.h \
-		enum RDMA_NLDEV_ATTR_PORT_INDEX \
-		$(AUTOCONF_OUTPUT)
-	$Q sh -- '$<' '$@' \
-		HAVE_RDMA_NLDEV_ATTR_NDEV_INDEX \
-		rdma/rdma_netlink.h \
-		enum RDMA_NLDEV_ATTR_NDEV_INDEX \
-		$(AUTOCONF_OUTPUT)
-	$Q sh -- '$<' '$@' \
-		HAVE_IFLA_NUM_VF \
-		linux/if_link.h \
-		enum IFLA_NUM_VF \
-		$(AUTOCONF_OUTPUT)
-	$Q sh -- '$<' '$@' \
-		HAVE_IFLA_EXT_MASK \
-		linux/if_link.h \
-		enum IFLA_EXT_MASK \
-		$(AUTOCONF_OUTPUT)
-	$Q sh -- '$<' '$@' \
-		HAVE_IFLA_PHYS_SWITCH_ID \
-		linux/if_link.h \
-		enum IFLA_PHYS_SWITCH_ID \
-		$(AUTOCONF_OUTPUT)
-	$Q sh -- '$<' '$@' \
-		HAVE_IFLA_PHYS_PORT_NAME \
-		linux/if_link.h \
-		enum IFLA_PHYS_PORT_NAME \
-		$(AUTOCONF_OUTPUT)
-	$Q sh -- '$<' '$@' \
-		HAVE_DEVLINK \
-		linux/devlink.h \
-		define DEVLINK_GENL_NAME \
-		$(AUTOCONF_OUTPUT)
-	$Q sh -- '$<' '$@' \
-		HAVE_SUPPORTED_40000baseKR4_Full \
-		/usr/include/linux/ethtool.h \
-		define SUPPORTED_40000baseKR4_Full \
-		$(AUTOCONF_OUTPUT)
-	$Q sh -- '$<' '$@' \
-		HAVE_SUPPORTED_40000baseCR4_Full \
-		/usr/include/linux/ethtool.h \
-		define SUPPORTED_40000baseCR4_Full \
-		$(AUTOCONF_OUTPUT)
-	$Q sh -- '$<' '$@' \
-		HAVE_SUPPORTED_40000baseSR4_Full \
-		/usr/include/linux/ethtool.h \
-		define SUPPORTED_40000baseSR4_Full \
-		$(AUTOCONF_OUTPUT)
-	$Q sh -- '$<' '$@' \
-		HAVE_SUPPORTED_40000baseLR4_Full \
-		/usr/include/linux/ethtool.h \
-		define SUPPORTED_40000baseLR4_Full \
-		$(AUTOCONF_OUTPUT)
-	$Q sh -- '$<' '$@' \
-		HAVE_SUPPORTED_56000baseKR4_Full \
-		/usr/include/linux/ethtool.h \
-		define SUPPORTED_56000baseKR4_Full \
-		$(AUTOCONF_OUTPUT)
-	$Q sh -- '$<' '$@' \
-		HAVE_SUPPORTED_56000baseCR4_Full \
-		/usr/include/linux/ethtool.h \
-		define SUPPORTED_56000baseCR4_Full \
-		$(AUTOCONF_OUTPUT)
-	$Q sh -- '$<' '$@' \
-		HAVE_SUPPORTED_56000baseSR4_Full \
-		/usr/include/linux/ethtool.h \
-		define SUPPORTED_56000baseSR4_Full \
-		$(AUTOCONF_OUTPUT)
-	$Q sh -- '$<' '$@' \
-		HAVE_SUPPORTED_56000baseLR4_Full \
-		/usr/include/linux/ethtool.h \
-		define SUPPORTED_56000baseLR4_Full \
-		$(AUTOCONF_OUTPUT)
-	$Q sh -- '$<' '$@' \
-		HAVE_STATIC_ASSERT \
-		/usr/include/assert.h \
-		define static_assert \
-		$(AUTOCONF_OUTPUT)
-
-# Create mlx5_autoconf.h or update it in case it differs from the new one.
-
-mlx5_autoconf.h: mlx5_autoconf.h.new
-	$Q [ -f '$@' ] && \
-		cmp '$<' '$@' $(AUTOCONF_OUTPUT) || \
-		mv '$<' '$@'
-
-ifeq ($(findstring y,$(CONFIG_RTE_LIBRTE_MLX5_PMD)$(CONFIG_RTE_LIBRTE_MLX5_VDPA_PMD)$(CONFIG_RTE_LIBRTE_MLX5_REGEX_PMD)),y)
-$(SRCS-y:.c=.o): mlx5_autoconf.h
-endif
-
-# Generate dependency plug-in for rdma-core when the PMD must not be linked
-# directly, so that applications do not inherit this dependency.
-
-ifeq ($(CONFIG_RTE_IBVERBS_LINK_DLOPEN),y)
-
-$(LIB): $(LIB_GLUE)
-
-ifeq ($(LINK_USING_CC),1)
-GLUE_LDFLAGS := $(call linkerprefix,$(LDFLAGS))
-else
-GLUE_LDFLAGS := $(LDFLAGS)
-endif
-$(LIB_GLUE): linux/mlx5_glue.o
-	$Q $(LD) $(GLUE_LDFLAGS) $(EXTRA_LDFLAGS) \
-		-Wl,-h,$(LIB_GLUE) \
-		-shared -o $@ $< -libverbs -lmlx5
-
-linux/mlx5_glue.o: mlx5_autoconf.h
-
-endif
-
-clean_mlx5: FORCE
-	$Q rm -f -- mlx5_autoconf.h mlx5_autoconf.h.new
-	$Q rm -f -- linux/mlx5_glue.o $(LIB_GLUE_BASE)*
-
-clean: clean_mlx5
diff --git a/drivers/common/mvep/Makefile b/drivers/common/mvep/Makefile
deleted file mode 100644
index f91d295e5c..0000000000
--- a/drivers/common/mvep/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2018 Marvell International Ltd.
-#
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-ifneq ($(MAKECMDGOALS),clean)
-ifneq ($(MAKECMDGOALS),config)
-ifeq ($(LIBMUSDK_PATH),)
-$(error "Please define LIBMUSDK_PATH environment variable")
-endif
-endif
-endif
-
-# library name
-LIB = librte_common_mvep.a
-
-# versioning export map
-EXPORT_MAP := rte_common_mvep_version.map
-
-# external library dependencies
-CFLAGS += -I$($RTE_SDK)/drivers/common/mvep
-CFLAGS += -I$(LIBMUSDK_PATH)/include
-CFLAGS += -DMVCONF_TYPES_PUBLIC
-CFLAGS += -DMVCONF_DMA_PHYS_ADDR_T_PUBLIC
-CFLAGS += $(WERROR_FLAGS)
-CFLAGS += -O3
-LDLIBS += -L$(LIBMUSDK_PATH)/lib
-LDLIBS += -lmusdk
-LDLIBS += -lrte_eal -lrte_kvargs
-
-# library source files
-SRCS-y += mvep_common.c
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/common/octeontx/Makefile b/drivers/common/octeontx/Makefile
deleted file mode 100644
index 5e67df0583..0000000000
--- a/drivers/common/octeontx/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2018 Cavium, Inc
-#
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-#
-# library name
-#
-LIB = librte_common_octeontx.a
-
-CFLAGS += $(WERROR_FLAGS)
-EXPORT_MAP := rte_common_octeontx_version.map
-
-#
-# all source are stored in SRCS-y
-#
-SRCS-y += octeontx_mbox.c
-
-LDLIBS += -lrte_eal
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/common/octeontx2/Makefile b/drivers/common/octeontx2/Makefile
deleted file mode 100644
index 260da8dd3e..0000000000
--- a/drivers/common/octeontx2/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(C) 2019 Marvell International Ltd.
-#
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-#
-# library name
-#
-LIB = librte_common_octeontx2.a
-
-CFLAGS += $(WERROR_FLAGS)
-CFLAGS += -I$(RTE_SDK)/drivers/common/octeontx2
-CFLAGS += -I$(RTE_SDK)/drivers/mempool/octeontx2
-CFLAGS += -I$(RTE_SDK)/drivers/bus/pci
-
-ifneq ($(CONFIG_RTE_ARCH_64),y)
-CFLAGS += -Wno-int-to-pointer-cast
-CFLAGS += -Wno-pointer-to-int-cast
-ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y)
-CFLAGS += -diag-disable 2259
-endif
-endif
-
-EXPORT_MAP := rte_common_octeontx2_version.map
-
-#
-# all source are stored in SRCS-y
-#
-SRCS-y += otx2_dev.c
-SRCS-y += otx2_irq.c
-SRCS-y += otx2_mbox.c
-SRCS-y += otx2_common.c
-SRCS-y += otx2_sec_idev.c
-
-LDLIBS += -lrte_eal
-LDLIBS += -lrte_ethdev -lrte_kvargs
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/common/qat/Makefile b/drivers/common/qat/Makefile
deleted file mode 100644
index 85d4207099..0000000000
--- a/drivers/common/qat/Makefile
+++ /dev/null
@@ -1,74 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2015-2018 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-# build directories
-QAT_CRYPTO_DIR := $(RTE_SDK)/drivers/crypto/qat
-QAT_COMPRESS_DIR := $(RTE_SDK)/drivers/compress/qat
-VPATH=$(QAT_CRYPTO_DIR):$(QAT_COMPRESS_DIR)
-
-# external library include paths
-CFLAGS += -I$(SRCDIR)/qat_adf
-CFLAGS += -I$(SRCDIR)
-CFLAGS += -I$(QAT_CRYPTO_DIR)
-CFLAGS += -I$(QAT_COMPRESS_DIR)
-
-
-ifeq ($(CONFIG_RTE_LIBRTE_COMPRESSDEV),y)
-	LDLIBS += -lrte_compressdev
-	SRCS-y += qat_comp.c
-	SRCS-y += qat_comp_pmd.c
-	build_qat = yes
-endif
-
-# library symmetric crypto source files
-ifeq ($(CONFIG_RTE_LIBRTE_CRYPTODEV),y)
-ifeq ($(CONFIG_RTE_LIBRTE_PMD_QAT_ASYM),y)
-	LDLIBS += -lrte_cryptodev
-	LDLIBS += -lcrypto
-	CFLAGS += -DBUILD_QAT_ASYM
-	SRCS-y += qat_asym.c
-	SRCS-y += qat_asym_pmd.c
-	build_qat = yes
-endif
-ifeq ($(CONFIG_RTE_LIBRTE_PMD_QAT_SYM),y)
-	LDLIBS += -lrte_cryptodev
-	LDLIBS += -lcrypto
-ifeq ($(CONFIG_RTE_LIBRTE_SECURITY),y)
-	LDLIBS += -lrte_net
-endif
-	CFLAGS += -DBUILD_QAT_SYM
-	SRCS-y += qat_sym.c
-	SRCS-y += qat_sym_session.c
-	SRCS-y += qat_sym_pmd.c
-	build_qat = yes
-endif
-endif
-
-ifdef build_qat
-
-	# library name
-	LIB = librte_pmd_qat.a
-
-	# build flags
-	CFLAGS += $(WERROR_FLAGS)
-	CFLAGS += -O3
-
-	# library common source files
-	SRCS-y += qat_device.c
-	SRCS-y += qat_common.c
-	SRCS-y += qat_logs.c
-	SRCS-y += qat_qp.c
-
-	LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool
-	LDLIBS += -lrte_pci -lrte_bus_pci
-
-	# export include files
-	SYMLINK-y-include +=
-
-	# versioning export map
-	EXPORT_MAP := ../../compress/qat/rte_pmd_qat_version.map
-endif
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/compress/Makefile b/drivers/compress/Makefile
deleted file mode 100644
index 286ea6ee84..0000000000
--- a/drivers/compress/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2018 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-DIRS-$(CONFIG_RTE_LIBRTE_PMD_ISAL) += isal
-DIRS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_ZIPVF) += octeontx
-DIRS-$(CONFIG_RTE_LIBRTE_PMD_ZLIB) += zlib
-
-include $(RTE_SDK)/mk/rte.subdir.mk
diff --git a/drivers/compress/isal/Makefile b/drivers/compress/isal/Makefile
deleted file mode 100644
index 1e225ab434..0000000000
--- a/drivers/compress/isal/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2018 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-# library name
-LIB = librte_pmd_isal_comp.a
-
-# build flags
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS)
-
-# external library dependencies
-LDLIBS += -lisal
-LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring
-LDLIBS += -lrte_compressdev
-LDLIBS += -lrte_bus_vdev
-
-# versioning export map
-EXPORT_MAP := rte_pmd_isal_version.map
-
-# library source files
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_ISAL) += isal_compress_pmd.c
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_ISAL) += isal_compress_pmd_ops.c
-
-# export include files
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/compress/octeontx/Makefile b/drivers/compress/octeontx/Makefile
deleted file mode 100644
index 9ba1db791e..0000000000
--- a/drivers/compress/octeontx/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2018 Cavium, Inc
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-# library name
-LIB = librte_pmd_octeontx_zip.a
-
-# build flags
-CFLAGS += $(WERROR_FLAGS)
-CFLAGS += -O3
-CFLAGS += -I$(RTE_SDK)/drivers/compress/octeontx/include
-
-# external library include paths
-LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring
-LDLIBS += -lrte_compressdev
-LDLIBS += -lrte_pci -lrte_bus_pci
-
-# library source files
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_ZIPVF) += otx_zip_pmd.c
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_ZIPVF) += otx_zip.c
-
-# versioning export map
-EXPORT_MAP := rte_pmd_octeontx_compress_version.map
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/compress/zlib/Makefile b/drivers/compress/zlib/Makefile
deleted file mode 100644
index 9f695f7d9a..0000000000
--- a/drivers/compress/zlib/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2018 Cavium Networks
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-# library name
-LIB = librte_pmd_zlib.a
-
-# build flags
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS)
-
-# versioning export map
-EXPORT_MAP := rte_pmd_zlib_version.map
-
-# external library dependencies
-LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring -lz
-LDLIBS += -lrte_compressdev
-LDLIBS += -lrte_bus_vdev
-
-# library source files
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_ZLIB) += zlib_pmd.c
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_ZLIB) += zlib_pmd_ops.c
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/crypto/Makefile b/drivers/crypto/Makefile
deleted file mode 100644
index 47a2a9e794..0000000000
--- a/drivers/crypto/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2017 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-DIRS-$(CONFIG_RTE_LIBRTE_PMD_AESNI_GCM) += aesni_gcm
-DIRS-$(CONFIG_RTE_LIBRTE_PMD_AESNI_MB) += aesni_mb
-DIRS-$(CONFIG_RTE_LIBRTE_PMD_ARMV8_CRYPTO) += armv8
-DIRS-$(CONFIG_RTE_LIBRTE_PMD_CCP) += ccp
-DIRS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_CRYPTO) += octeontx
-DIRS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_CRYPTO) += octeontx2
-DIRS-$(CONFIG_RTE_LIBRTE_PMD_OPENSSL) += openssl
-DIRS-$(CONFIG_RTE_LIBRTE_PMD_CRYPTO_SCHEDULER) += scheduler
-DIRS-$(CONFIG_RTE_LIBRTE_PMD_SNOW3G) += snow3g
-DIRS-$(CONFIG_RTE_LIBRTE_PMD_KASUMI) += kasumi
-DIRS-$(CONFIG_RTE_LIBRTE_PMD_ZUC) += zuc
-DIRS-$(CONFIG_RTE_LIBRTE_PMD_MVSAM_CRYPTO) += mvsam
-DIRS-$(CONFIG_RTE_LIBRTE_PMD_NULL_CRYPTO) += null
-ifeq ($(CONFIG_RTE_EAL_VFIO)$(CONFIG_RTE_LIBRTE_FSLMC_BUS),yy)
-DIRS-$(CONFIG_RTE_LIBRTE_PMD_DPAA2_SEC) += dpaa2_sec
-endif # CONFIG_RTE_LIBRTE_FSLMC_BUS
-ifeq ($(CONFIG_RTE_LIBRTE_DPAA_BUS),y)
-DIRS-$(CONFIG_RTE_LIBRTE_PMD_DPAA_SEC) += dpaa_sec
-endif # CONFIG_RTE_LIBRTE_PMD_DPAA_SEC
-ifeq ($(CONFIG_RTE_LIBRTE_SECURITY),y)
-DIRS-$(CONFIG_RTE_LIBRTE_PMD_CAAM_JR) += caam_jr
-endif # CONFIG_RTE_LIBRTE_SECURITY
-DIRS-$(CONFIG_RTE_LIBRTE_PMD_VIRTIO_CRYPTO) += virtio
-DIRS-$(CONFIG_RTE_LIBRTE_PMD_NITROX) += nitrox
-
-include $(RTE_SDK)/mk/rte.subdir.mk
diff --git a/drivers/crypto/aesni_gcm/Makefile b/drivers/crypto/aesni_gcm/Makefile
deleted file mode 100644
index 01cb4fddfe..0000000000
--- a/drivers/crypto/aesni_gcm/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2016-2017 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-# library name
-LIB = librte_pmd_aesni_gcm.a
-
-# build flags
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS)
-
-# versioning export map
-EXPORT_MAP := rte_pmd_aesni_gcm_version.map
-
-# external library dependencies
-LDLIBS += -lIPSec_MB
-LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring
-LDLIBS += -lrte_cryptodev
-LDLIBS += -lrte_bus_vdev
-
-H := \#
-IMB_HDR = $(shell echo '$Hinclude <intel-ipsec-mb.h>' | \
-	$(CC) -E $(EXTRA_CFLAGS) - | grep 'intel-ipsec-mb.h' | \
-	head -n1 | cut -d'"' -f2)
-
-# Detect library version
-IMB_VERSION = $(shell grep -e "IMB_VERSION_STR" $(IMB_HDR) | cut -d'"' -f2)
-IMB_VERSION_NUM = $(shell grep -e "IMB_VERSION_NUM" $(IMB_HDR) | cut -d' ' -f3)
-
-ifeq ($(IMB_VERSION),)
-$(error "IPSec_MB version >= 0.52 is required")
-endif
-
-ifeq ($(shell expr $(IMB_VERSION_NUM) \< 0x3400), 1)
-$(error "IPSec_MB version >= 0.52 is required")
-endif
-
-# library source files
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_AESNI_GCM) += aesni_gcm_pmd.c
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_AESNI_GCM) += aesni_gcm_pmd_ops.c
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/crypto/aesni_mb/Makefile b/drivers/crypto/aesni_mb/Makefile
deleted file mode 100644
index f0dc82f395..0000000000
--- a/drivers/crypto/aesni_mb/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2015-2018 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-# library name
-LIB = librte_pmd_aesni_mb.a
-
-# build flags
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS)
-
-# versioning export map
-EXPORT_MAP := rte_pmd_aesni_mb_version.map
-
-# external library dependencies
-LDLIBS += -lIPSec_MB
-LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring
-LDLIBS += -lrte_cryptodev
-LDLIBS += -lrte_bus_vdev
-
-H := \#
-IMB_HDR = $(shell echo '$Hinclude <intel-ipsec-mb.h>' | \
-	$(CC) -E $(EXTRA_CFLAGS) - | grep 'intel-ipsec-mb.h' | \
-	head -n1 | cut -d'"' -f2)
-
-# Detect library version
-IMB_VERSION = $(shell grep -e "IMB_VERSION_STR" $(IMB_HDR) | cut -d'"' -f2)
-IMB_VERSION_NUM = $(shell grep -e "IMB_VERSION_NUM" $(IMB_HDR) | cut -d' ' -f3)
-
-ifeq ($(IMB_VERSION),)
-$(error "IPSec_MB version >= 0.52 is required")
-endif
-
-ifeq ($(shell expr $(IMB_VERSION_NUM) \< 0x3400), 1)
-$(error "IPSec_MB version >= 0.52 is required")
-endif
-
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_AESNI_MB) += rte_aesni_mb_pmd.c
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_AESNI_MB) += rte_aesni_mb_pmd_ops.c
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/crypto/armv8/Makefile b/drivers/crypto/armv8/Makefile
deleted file mode 100644
index 0e3bc9fb70..0000000000
--- a/drivers/crypto/armv8/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2017 Cavium, Inc
-#
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-ifneq ($(MAKECMDGOALS),clean)
-ifneq ($(MAKECMDGOALS),config)
-ifeq ($(ARMV8_CRYPTO_LIB_PATH),)
-$(error "Please define ARMV8_CRYPTO_LIB_PATH environment variable")
-endif
-endif
-endif
-
-# library name
-LIB = librte_pmd_armv8.a
-
-# build flags
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS)
-
-# versioning export map
-EXPORT_MAP := rte_pmd_armv8_version.map
-
-# external library dependencies
-CFLAGS += -I$(ARMV8_CRYPTO_LIB_PATH)
-LDLIBS += -L$(ARMV8_CRYPTO_LIB_PATH) -lAArch64crypto
-LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring
-LDLIBS += -lrte_cryptodev
-LDLIBS += -lrte_bus_vdev
-
-# library source files
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_ARMV8_CRYPTO) += rte_armv8_pmd.c
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_ARMV8_CRYPTO) += rte_armv8_pmd_ops.c
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/crypto/caam_jr/Makefile b/drivers/crypto/caam_jr/Makefile
deleted file mode 100644
index 89d3238172..0000000000
--- a/drivers/crypto/caam_jr/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2017 NXP
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-#
-# library name
-#
-LIB = librte_pmd_caam_jr.a
-
-# build flags
-CFLAGS += -D _GNU_SOURCE
-
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS)
-
-CFLAGS += -I$(RTE_SDK)/drivers/bus/dpaa/include
-CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax
-CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax/caamflib/
-CFLAGS += -I$(RTE_SDK)/drivers/crypto/caam_jr
-CFLAGS += -I$(RTE_SDK)/lib/librte_eal/include
-
-# versioning export map
-EXPORT_MAP := rte_pmd_caam_jr_version.map
-
-# library source files
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_CAAM_JR) += caam_jr.c
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_CAAM_JR) += caam_jr_capabilities.c
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_CAAM_JR) += caam_jr_hw.c
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_CAAM_JR) += caam_jr_uio.c
-# library dependencies
-
-LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring
-LDLIBS += -lrte_cryptodev
-LDLIBS += -lrte_bus_dpaa
-LDLIBS += -lrte_bus_vdev
-LDLIBS += -lrte_common_dpaax
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/crypto/ccp/Makefile b/drivers/crypto/ccp/Makefile
deleted file mode 100644
index 3f5da2adf3..0000000000
--- a/drivers/crypto/ccp/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@ 
-#   SPDX-License-Identifier: BSD-3-Clause
-#   Copyright(c) 2018 Advanced Micro Devices, Inc. All rights reserved.
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-# library name
-LIB = librte_pmd_ccp.a
-
-# build flags
-CFLAGS += -O3
-CFLAGS += -I$(SRCDIR)
-CFLAGS += $(WERROR_FLAGS)
-
-# external library include paths
-LDLIBS += -lcrypto
-LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring
-LDLIBS += -lrte_cryptodev
-LDLIBS += -lrte_pci -lrte_bus_pci
-LDLIBS += -lrte_bus_vdev
-LDLIBS += -lrte_kvargs
-
-# versioning export map
-EXPORT_MAP := rte_pmd_ccp_version.map
-
-# library source files
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_CCP) += rte_ccp_pmd.c
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_CCP) += ccp_crypto.c
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_CCP) += ccp_dev.c
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_CCP) += ccp_pci.c
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_CCP) += ccp_pmd_ops.c
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/crypto/dpaa2_sec/Makefile b/drivers/crypto/dpaa2_sec/Makefile
deleted file mode 100644
index a0a2795575..0000000000
--- a/drivers/crypto/dpaa2_sec/Makefile
+++ /dev/null
@@ -1,45 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright (c) 2016 Freescale Semiconductor, Inc. All rights reserved.
-# Copyright 2016 NXP
-#
-
-include $(RTE_SDK)/mk/rte.vars.mk
-#
-# library name
-#
-LIB = librte_pmd_dpaa2_sec.a
-
-# build flags
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS)
-
-ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y)
-ifeq ($(shell test $(GCC_VERSION) -gt 70 && echo 1), 1)
-CFLAGS += -Wno-implicit-fallthrough
-endif
-endif
-
-CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax
-CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax/caamflib
-CFLAGS += -I$(RTE_SDK)/drivers/crypto/dpaa2_sec/
-CFLAGS += -I$(RTE_SDK)/drivers/crypto/dpaa2_sec/mc
-CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc/
-CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc/qbman/include
-CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc/mc
-CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc/portal
-CFLAGS += -I$(RTE_SDK)/drivers/mempool/dpaa2/
-
-# versioning export map
-EXPORT_MAP := rte_pmd_dpaa2_sec_version.map
-
-# library source files
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_DPAA2_SEC) += dpaa2_sec_dpseci.c
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_DPAA2_SEC) += mc/dpseci.c
-
-LDLIBS += -lrte_bus_fslmc
-LDLIBS += -lrte_mempool_dpaa2
-LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring
-LDLIBS += -lrte_cryptodev
-LDLIBS += -lrte_common_dpaax
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/crypto/dpaa_sec/Makefile b/drivers/crypto/dpaa_sec/Makefile
deleted file mode 100644
index ea266962a3..0000000000
--- a/drivers/crypto/dpaa_sec/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright (c) 2016 Freescale Semiconductor, Inc. All rights reserved.
-# Copyright 2017 NXP
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-#
-# library name
-#
-LIB = librte_pmd_dpaa_sec.a
-
-# build flags
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS)
-
-CFLAGS += -I$(RTE_SDK)/drivers/bus/dpaa
-CFLAGS += -I$(RTE_SDK)/drivers/bus/dpaa/include
-CFLAGS += -I$(RTE_SDK)/drivers/bus/dpaa/base/qbman
-CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax
-CFLAGS += -I$(RTE_SDK)/drivers/crypto/dpaa_sec/
-CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax/caamflib/
-CFLAGS += -I$(RTE_SDK)/lib/librte_eal/include
-LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring
-LDLIBS += -lrte_cryptodev
-
-# versioning export map
-EXPORT_MAP := rte_pmd_dpaa_sec_version.map
-
-# library source files
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_DPAA_SEC) += dpaa_sec.c
-
-# library dependencies
-
-LDLIBS += -lrte_bus_dpaa
-LDLIBS += -lrte_mempool_dpaa
-LDLIBS += -lrte_common_dpaax
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/crypto/kasumi/Makefile b/drivers/crypto/kasumi/Makefile
deleted file mode 100644
index a7d0d079d2..0000000000
--- a/drivers/crypto/kasumi/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2016 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-# library name
-LIB = librte_pmd_kasumi.a
-
-# build flags
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS)
-
-# versioning export map
-EXPORT_MAP := rte_pmd_kasumi_version.map
-
-# external library dependencies
-LDLIBS += -lIPSec_MB
-LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring
-LDLIBS += -lrte_cryptodev
-LDLIBS += -lrte_bus_vdev
-
-H := \#
-IMB_HDR = $(shell echo '$Hinclude <intel-ipsec-mb.h>' | \
-	$(CC) -E $(EXTRA_CFLAGS) - | grep 'intel-ipsec-mb.h' | \
-	head -n1 | cut -d'"' -f2)
-
-# Detect library version
-IMB_VERSION = $(shell grep -e "IMB_VERSION_STR" $(IMB_HDR) | cut -d'"' -f2)
-IMB_VERSION_NUM = $(shell grep -e "IMB_VERSION_NUM" $(IMB_HDR) | cut -d' ' -f3)
-
-ifeq ($(IMB_VERSION),)
-$(error "IPSec_MB version >= 0.53 is required")
-endif
-
-ifeq ($(shell expr $(IMB_VERSION_NUM) \< 0x3400), 1)
-$(error "IPSec_MB version >= 0.53 is required")
-endif
-# library source files
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_KASUMI) += rte_kasumi_pmd.c
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_KASUMI) += rte_kasumi_pmd_ops.c
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/crypto/mvsam/Makefile b/drivers/crypto/mvsam/Makefile
deleted file mode 100644
index f0641ae7d9..0000000000
--- a/drivers/crypto/mvsam/Makefile
+++ /dev/null
@@ -1,40 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2017 Marvell International Ltd.
-# Copyright(c) 2017 Semihalf.
-# All rights reserved.
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-ifneq ($(MAKECMDGOALS),clean)
-ifneq ($(MAKECMDGOALS),config)
-ifeq ($(LIBMUSDK_PATH),)
-$(error "Please define LIBMUSDK_PATH environment variable")
-endif
-endif
-endif
-
-# library name
-LIB = librte_pmd_mvsam_crypto.a
-
-# build flags
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS)
-CFLAGS += -I$(RTE_SDK)/drivers/common/mvep
-CFLAGS += -I$(LIBMUSDK_PATH)/include
-CFLAGS += -DMVCONF_TYPES_PUBLIC
-CFLAGS += -DMVCONF_DMA_PHYS_ADDR_T_PUBLIC
-
-# versioning export map
-EXPORT_MAP := rte_pmd_mvsam_version.map
-
-# external library dependencies
-LDLIBS += -L$(LIBMUSDK_PATH)/lib -lmusdk
-LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_kvargs
-LDLIBS += -lrte_cryptodev
-LDLIBS += -lrte_bus_vdev -lrte_common_mvep
-
-# library source files
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_MVSAM_CRYPTO) += rte_mrvl_pmd.c
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_MVSAM_CRYPTO) += rte_mrvl_pmd_ops.c
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/crypto/nitrox/Makefile b/drivers/crypto/nitrox/Makefile
deleted file mode 100644
index 535121196b..0000000000
--- a/drivers/crypto/nitrox/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(C) 2019 Marvell International Ltd.
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-# library name
-LIB = librte_pmd_nitrox.a
-
-# build flags
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS)
-
-# versioning export map
-EXPORT_MAP := rte_pmd_nitrox_version.map
-
-# external library dependencies
-LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool
-LDLIBS += -lrte_pci -lrte_bus_pci
-LDLIBS += -lrte_cryptodev
-
-# library source files
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_NITROX) += nitrox_device.c
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_NITROX) += nitrox_hal.c
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_NITROX) += nitrox_logs.c
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_NITROX) += nitrox_sym.c
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_NITROX) += nitrox_sym_capabilities.c
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_NITROX) += nitrox_sym_reqmgr.c
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_NITROX) += nitrox_qp.c
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/crypto/null/Makefile b/drivers/crypto/null/Makefile
deleted file mode 100644
index 4595055f01..0000000000
--- a/drivers/crypto/null/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2016 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-
-# library name
-LIB = librte_pmd_null_crypto.a
-
-# build flags
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS)
-LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring
-LDLIBS += -lrte_cryptodev
-LDLIBS += -lrte_bus_vdev
-
-# versioning export map
-EXPORT_MAP := rte_pmd_null_crypto_version.map
-
-# library source files
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_NULL_CRYPTO) += null_crypto_pmd.c
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_NULL_CRYPTO) += null_crypto_pmd_ops.c
-
-# export include files
-SYMLINK-y-include +=
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/crypto/octeontx/Makefile b/drivers/crypto/octeontx/Makefile
deleted file mode 100644
index 296755ee90..0000000000
--- a/drivers/crypto/octeontx/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2018 Cavium, Inc
-#
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-# library name
-LIB = librte_pmd_octeontx_crypto.a
-
-# build flags
-CFLAGS += $(WERROR_FLAGS)
-
-LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring
-LDLIBS += -lrte_cryptodev
-LDLIBS += -lrte_pci -lrte_bus_pci
-LDLIBS += -lrte_common_cpt
-
-VPATH += $(RTE_SDK)/drivers/crypto/octeontx
-
-CFLAGS += -O3
-CFLAGS += -I$(RTE_SDK)/drivers/common/cpt
-
-# PMD code
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_CRYPTO) += otx_cryptodev.c
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_CRYPTO) += otx_cryptodev_capabilities.c
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_CRYPTO) += otx_cryptodev_hw_access.c
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_CRYPTO) += otx_cryptodev_mbox.c
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_CRYPTO) += otx_cryptodev_ops.c
-
-# export include files
-SYMLINK-y-include +=
-
-# versioning export map
-EXPORT_MAP := rte_pmd_octeontx_crypto_version.map
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/crypto/octeontx2/Makefile b/drivers/crypto/octeontx2/Makefile
deleted file mode 100644
index 14152c6117..0000000000
--- a/drivers/crypto/octeontx2/Makefile
+++ /dev/null
@@ -1,49 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright (C) 2019 Marvell International Ltd.
-#
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-# library name
-LIB = librte_pmd_octeontx2_crypto.a
-
-# build flags
-CFLAGS += $(WERROR_FLAGS)
-
-LDLIBS += -lrte_eal -lrte_ethdev -lrte_mbuf -lrte_mempool -lrte_ring
-LDLIBS += -lrte_cryptodev -lrte_security
-LDLIBS += -lrte_pci -lrte_bus_pci
-LDLIBS += -lrte_common_cpt -lrte_common_octeontx2
-
-VPATH += $(RTE_SDK)/drivers/crypto/octeontx2
-
-CFLAGS += -O3
-CFLAGS += -I$(RTE_SDK)/drivers/common/cpt
-CFLAGS += -I$(RTE_SDK)/drivers/common/octeontx2
-CFLAGS += -I$(RTE_SDK)/drivers/crypto/octeontx2
-CFLAGS += -I$(RTE_SDK)/drivers/mempool/octeontx2
-CFLAGS += -I$(RTE_SDK)/drivers/net/octeontx2
-
-ifneq ($(CONFIG_RTE_ARCH_64),y)
-CFLAGS += -Wno-int-to-pointer-cast
-CFLAGS += -Wno-pointer-to-int-cast
-ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y)
-CFLAGS += -diag-disable 2259
-endif
-endif
-
-# PMD code
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_CRYPTO) += otx2_cryptodev.c
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_CRYPTO) += otx2_cryptodev_capabilities.c
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_CRYPTO) += otx2_cryptodev_hw_access.c
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_CRYPTO) += otx2_cryptodev_mbox.c
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_CRYPTO) += otx2_cryptodev_ops.c
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_CRYPTO) += otx2_cryptodev_sec.c
-
-# export include files
-SYMLINK-y-include +=
-
-# versioning export map
-EXPORT_MAP := rte_pmd_octeontx2_crypto_version.map
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/crypto/openssl/Makefile b/drivers/crypto/openssl/Makefile
deleted file mode 100644
index b85c816551..0000000000
--- a/drivers/crypto/openssl/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2016 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-# library name
-LIB = librte_pmd_openssl.a
-
-# build flags
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS)
-
-# versioning export map
-EXPORT_MAP := rte_pmd_openssl_version.map
-
-# external library dependencies
-LDLIBS += -lcrypto
-LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring
-LDLIBS += -lrte_cryptodev
-LDLIBS += -lrte_bus_vdev
-
-# library source files
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_OPENSSL) += rte_openssl_pmd.c
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_OPENSSL) += rte_openssl_pmd_ops.c
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/crypto/scheduler/Makefile b/drivers/crypto/scheduler/Makefile
deleted file mode 100644
index 67aac024c4..0000000000
--- a/drivers/crypto/scheduler/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2017 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-# library name
-LIB = librte_pmd_crypto_scheduler.a
-
-# build flags
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS)
-LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring
-LDLIBS += -lrte_cryptodev -lrte_kvargs -lrte_reorder
-LDLIBS += -lrte_bus_vdev
-
-# versioning export map
-EXPORT_MAP := rte_pmd_crypto_scheduler_version.map
-
-#
-# Export include files
-#
-SYMLINK-y-include += rte_cryptodev_scheduler_operations.h
-SYMLINK-y-include += rte_cryptodev_scheduler.h
-
-# library source files
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_CRYPTO_SCHEDULER) += scheduler_pmd.c
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_CRYPTO_SCHEDULER) += scheduler_pmd_ops.c
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_CRYPTO_SCHEDULER) += rte_cryptodev_scheduler.c
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_CRYPTO_SCHEDULER) += scheduler_roundrobin.c
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_CRYPTO_SCHEDULER) += scheduler_pkt_size_distr.c
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_CRYPTO_SCHEDULER) += scheduler_failover.c
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_CRYPTO_SCHEDULER) += scheduler_multicore.c
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/crypto/snow3g/Makefile b/drivers/crypto/snow3g/Makefile
deleted file mode 100644
index 469aefaa56..0000000000
--- a/drivers/crypto/snow3g/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2016-2019 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-# library name
-LIB = librte_pmd_snow3g.a
-
-# build flags
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS)
-
-# versioning export map
-EXPORT_MAP := rte_pmd_snow3g_version.map
-
-# external library dependencies
-LDLIBS += -lIPSec_MB
-LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring
-LDLIBS += -lrte_cryptodev
-LDLIBS += -lrte_bus_vdev
-
-H := \#
-IMB_HDR = $(shell echo '$Hinclude <intel-ipsec-mb.h>' | \
-	$(CC) -E $(EXTRA_CFLAGS) - | grep 'intel-ipsec-mb.h' | \
-	head -n1 | cut -d'"' -f2)
-
-# Detect library version
-IMB_VERSION = $(shell grep -e "IMB_VERSION_STR" $(IMB_HDR) | cut -d'"' -f2)
-IMB_VERSION_NUM = $(shell grep -e "IMB_VERSION_NUM" $(IMB_HDR) | cut -d' ' -f3)
-
-ifeq ($(IMB_VERSION),)
-$(error "IPSec_MB version >= 0.53 is required")
-endif
-
-ifeq ($(shell expr $(IMB_VERSION_NUM) \< 0x3400), 1)
-$(error "IPSec_MB version >= 0.53 is required")
-endif
-
-# library source files
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_SNOW3G) += rte_snow3g_pmd.c
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_SNOW3G) += rte_snow3g_pmd_ops.c
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/crypto/virtio/Makefile b/drivers/crypto/virtio/Makefile
deleted file mode 100644
index 32e2e4d5e9..0000000000
--- a/drivers/crypto/virtio/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2018 HUAWEI TECHNOLOGIES CO., LTD.
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-#
-# library name
-#
-LIB = librte_pmd_virtio_crypto.a
-
-#
-# include virtio_crypto.h
-#
-CFLAGS += -I$(RTE_SDK)/lib/librte_vhost
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS)
-
-EXPORT_MAP := rte_pmd_virtio_crypto_version.map
-
-#
-# all source are stored in SRCS-y
-#
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_VIRTIO_CRYPTO) += virtqueue.c
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_VIRTIO_CRYPTO) += virtio_pci.c
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_VIRTIO_CRYPTO) += virtio_rxtx.c
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_VIRTIO_CRYPTO) += virtio_cryptodev.c
-
-# this lib depends upon:
-LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool
-LDLIBS += -lrte_cryptodev
-LDLIBS += -lrte_pci -lrte_bus_pci
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/crypto/zuc/Makefile b/drivers/crypto/zuc/Makefile
deleted file mode 100644
index 529b47f25e..0000000000
--- a/drivers/crypto/zuc/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2016-2019 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-# library name
-LIB = librte_pmd_zuc.a
-
-# build flags
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS)
-
-# versioning export map
-EXPORT_MAP := rte_pmd_zuc_version.map
-
-# external library dependencies
-LDLIBS += -lIPSec_MB
-LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring
-LDLIBS += -lrte_cryptodev
-LDLIBS += -lrte_bus_vdev
-
-H := \#
-IMB_HDR = $(shell echo '$Hinclude <intel-ipsec-mb.h>' | \
-	$(CC) -E $(EXTRA_CFLAGS) - | grep 'intel-ipsec-mb.h' | \
-	head -n1 | cut -d'"' -f2)
-
-# Detect library version
-IMB_VERSION = $(shell grep -e "IMB_VERSION_STR" $(IMB_HDR) | cut -d'"' -f2)
-IMB_VERSION_NUM = $(shell grep -e "IMB_VERSION_NUM" $(IMB_HDR) | cut -d' ' -f3)
-
-ifeq ($(IMB_VERSION),)
-$(error "IPSec_MB version >= 0.53 is required")
-endif
-
-ifeq ($(shell expr $(IMB_VERSION_NUM) \< 0x3400), 1)
-$(error "IPSec_MB version >= 0.53 is required")
-endif
-# library source files
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_ZUC) += rte_zuc_pmd.c
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_ZUC) += rte_zuc_pmd_ops.c
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/event/Makefile b/drivers/event/Makefile
deleted file mode 100644
index 86be41b9eb..0000000000
--- a/drivers/event/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2016 Cavium, Inc
-#
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-DIRS-$(CONFIG_RTE_LIBRTE_PMD_SKELETON_EVENTDEV) += skeleton
-DIRS-$(CONFIG_RTE_LIBRTE_PMD_SW_EVENTDEV) += sw
-DIRS-$(CONFIG_RTE_LIBRTE_PMD_DSW_EVENTDEV) += dsw
-DIRS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_SSOVF) += octeontx
-DIRS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EVENTDEV) += octeontx2
-ifeq ($(CONFIG_RTE_LIBRTE_DPAA_BUS),y)
-DIRS-$(CONFIG_RTE_LIBRTE_PMD_DPAA_EVENTDEV) += dpaa
-endif
-ifeq ($(CONFIG_RTE_EAL_VFIO)$(CONFIG_RTE_LIBRTE_FSLMC_BUS),yy)
-DIRS-$(CONFIG_RTE_LIBRTE_PMD_DPAA2_EVENTDEV) += dpaa2
-endif
-DIRS-$(CONFIG_RTE_LIBRTE_PMD_OPDL_EVENTDEV) += opdl
-
-include $(RTE_SDK)/mk/rte.subdir.mk
diff --git a/drivers/event/dpaa/Makefile b/drivers/event/dpaa/Makefile
deleted file mode 100644
index a39dc27c62..0000000000
--- a/drivers/event/dpaa/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@ 
-#   SPDX-License-Identifier:        BSD-3-Clause
-#   Copyright 2017 NXP
-#
-
-include $(RTE_SDK)/mk/rte.vars.mk
-RTE_SDK_DPAA=$(RTE_SDK)/drivers/net/dpaa
-
-#
-# library name
-#
-LIB = librte_pmd_dpaa_event.a
-
-CFLAGS := -I$(SRCDIR) $(CFLAGS)
-CFLAGS += -O3 $(WERROR_FLAGS)
-CFLAGS += -Wno-pointer-arith
-CFLAGS += -I$(RTE_SDK_DPAA)/
-CFLAGS += -I$(RTE_SDK_DPAA)/include
-CFLAGS += -I$(RTE_SDK)/drivers/bus/dpaa
-CFLAGS += -I$(RTE_SDK)/drivers/bus/dpaa/include/
-CFLAGS += -I$(RTE_SDK)/drivers/mempool/dpaa
-CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax
-CFLAGS += -I$(RTE_SDK)/lib/librte_eal/include
-
-LDLIBS += -lrte_pmd_dpaa_sec
-CFLAGS += -I$(RTE_SDK)/drivers/crypto/dpaa_sec
-
-EXPORT_MAP := rte_pmd_dpaa_event_version.map
-
-# Interfaces with DPDK
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_DPAA_EVENTDEV) += dpaa_eventdev.c
-
-LDLIBS += -lrte_bus_dpaa
-LDLIBS += -lrte_mempool_dpaa
-LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring
-LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs
-LDLIBS += -lrte_eventdev -lrte_pmd_dpaa -lrte_bus_vdev
-LDLIBS += -lrte_common_dpaax
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/event/dpaa2/Makefile b/drivers/event/dpaa2/Makefile
deleted file mode 100644
index 75cf197c5c..0000000000
--- a/drivers/event/dpaa2/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2017,2019 NXP
-#
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-#
-# library name
-#
-LIB = librte_pmd_dpaa2_event.a
-
-CFLAGS += $(WERROR_FLAGS)
-
-CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc
-CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc/qbman/include
-CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc/mc
-CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc/portal
-CFLAGS += -I$(RTE_SDK)/drivers/mempool/dpaa2
-CFLAGS += -I$(RTE_SDK)/drivers/event/dpaa2
-CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax
-LDLIBS += -lrte_eal -lrte_eventdev
-LDLIBS += -lrte_common_dpaax
-LDLIBS += -lrte_bus_fslmc -lrte_mempool_dpaa2 -lrte_pmd_dpaa2
-LDLIBS += -lrte_bus_vdev -lrte_mempool -lrte_mbuf -lrte_ethdev
-CFLAGS += -I$(RTE_SDK)/drivers/net/dpaa2
-CFLAGS += -I$(RTE_SDK)/drivers/net/dpaa2/mc
-
-LDLIBS += -lrte_pmd_dpaa2_sec
-CFLAGS += -I$(RTE_SDK)/drivers/crypto/dpaa2_sec
-
-# versioning export map
-EXPORT_MAP := rte_pmd_dpaa2_event_version.map
-
-#
-# all source are stored in SRCS-y
-#
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_DPAA2_EVENTDEV) += dpaa2_hw_dpcon.c
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_DPAA2_EVENTDEV) += dpaa2_eventdev.c
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_DPAA2_EVENTDEV) += dpaa2_eventdev_selftest.c
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/event/dsw/Makefile b/drivers/event/dsw/Makefile
deleted file mode 100644
index f6e7dda1fd..0000000000
--- a/drivers/event/dsw/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2018 Ericsson AB
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-LIB = librte_pmd_dsw_event.a
-
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS)
-ifneq ($(CONFIG_RTE_TOOLCHAIN_ICC),y)
-CFLAGS += -Wno-format-nonliteral
-endif
-
-LDLIBS += -lrte_eal
-LDLIBS += -lrte_mbuf
-LDLIBS += -lrte_mempool
-LDLIBS += -lrte_ring
-LDLIBS += -lrte_eventdev
-LDLIBS += -lrte_bus_vdev
-
-EXPORT_MAP := rte_pmd_dsw_event_version.map
-
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_DSW_EVENTDEV) += \
-	dsw_evdev.c dsw_event.c dsw_xstats.c
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/event/octeontx/Makefile b/drivers/event/octeontx/Makefile
deleted file mode 100644
index c1233e098d..0000000000
--- a/drivers/event/octeontx/Makefile
+++ /dev/null
@@ -1,51 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2017 Cavium, Inc
-#
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-#
-# library name
-#
-LIB = librte_pmd_octeontx_ssovf.a
-
-CFLAGS += $(WERROR_FLAGS)
-CFLAGS += -I$(RTE_SDK)/drivers/common/octeontx/
-CFLAGS += -I$(RTE_SDK)/drivers/mempool/octeontx/
-CFLAGS += -I$(RTE_SDK)/drivers/net/octeontx/
-
-LDLIBS += -lrte_eal -lrte_eventdev -lrte_common_octeontx -lrte_pmd_octeontx
-LDLIBS += -lrte_bus_pci -lrte_mempool -lrte_mbuf -lrte_kvargs
-LDLIBS += -lrte_bus_vdev -lrte_ethdev
-
-EXPORT_MAP := rte_pmd_octeontx_event_version.map
-
-#
-# all source are stored in SRCS-y
-#
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_SSOVF) += ssovf_worker.c
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_SSOVF) += ssovf_evdev.c
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_SSOVF) += ssovf_evdev_selftest.c
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_SSOVF) += ssovf_probe.c
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_SSOVF) += timvf_worker.c
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_SSOVF) += timvf_evdev.c
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_SSOVF) += timvf_probe.c
-
-ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y)
-CFLAGS_ssovf_worker.o += -fno-prefetch-loop-arrays
-CFLAGS_timvf_worker.o += -fno-prefetch-loop-arrays
-
-ifeq ($(shell test $(GCC_VERSION) -ge 46 && echo 1), 1)
-CFLAGS_ssovf_worker.o += -Ofast
-CFLAGS_timvf_worker.o += -Ofast
-else
-CFLAGS_ssovf_worker.o += -O3 -ffast-math
-CFLAGS_timvf_worker.o += -O3 -ffast-math
-endif
-
-else
-CFLAGS_ssovf_worker.o += -Ofast
-CFLAGS_timvf_worker.o += -Ofast
-endif
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/event/octeontx2/Makefile b/drivers/event/octeontx2/Makefile
deleted file mode 100644
index 9d67b00c69..0000000000
--- a/drivers/event/octeontx2/Makefile
+++ /dev/null
@@ -1,47 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(C) 2019 Marvell International Ltd.
-#
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-#
-# library name
-#
-LIB = librte_pmd_octeontx2_event.a
-
-CFLAGS += $(WERROR_FLAGS)
-CFLAGS += -I$(RTE_SDK)/drivers/common/octeontx2
-CFLAGS += -I$(RTE_SDK)/drivers/crypto/octeontx2
-CFLAGS += -I$(RTE_SDK)/drivers/mempool/octeontx2
-CFLAGS += -I$(RTE_SDK)/drivers/event/octeontx2
-CFLAGS += -I$(RTE_SDK)/drivers/net/octeontx2
-CFLAGS += -O3
-
-ifneq ($(CONFIG_RTE_ARCH_64),y)
-CFLAGS += -Wno-int-to-pointer-cast
-CFLAGS += -Wno-pointer-to-int-cast
-ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y)
-CFLAGS += -diag-disable 2259
-endif
-endif
-
-EXPORT_MAP := rte_pmd_octeontx2_event_version.map
-
-#
-# all source are stored in SRCS-y
-#
-
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EVENTDEV) += otx2_worker_dual.c
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EVENTDEV) += otx2_worker.c
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EVENTDEV) += otx2_tim_worker.c
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EVENTDEV) += otx2_evdev.c
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EVENTDEV) += otx2_evdev_adptr.c
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EVENTDEV) += otx2_tim_evdev.c
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EVENTDEV) += otx2_evdev_selftest.c
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EVENTDEV) += otx2_evdev_irq.c
-
-LDLIBS += -lrte_eal -lrte_bus_pci -lrte_pci -lrte_kvargs
-LDLIBS += -lrte_mempool -lrte_eventdev -lrte_mbuf -lrte_ethdev
-LDLIBS += -lrte_common_octeontx2 -lrte_mempool_octeontx2
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/event/opdl/Makefile b/drivers/event/opdl/Makefile
deleted file mode 100644
index 71713b00ae..0000000000
--- a/drivers/event/opdl/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2017 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-# library name
-LIB = librte_pmd_opdl_event.a
-
-# build flags
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS)
-
-LDLIBS += -lrte_eal -lrte_eventdev -lrte_kvargs
-LDLIBS += -lrte_bus_vdev -lrte_mbuf -lrte_mempool
-
-# versioning export map
-EXPORT_MAP := rte_pmd_opdl_event_version.map
-
-# library source files
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_OPDL_EVENTDEV) += opdl_ring.c
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_OPDL_EVENTDEV) += opdl_evdev.c
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_OPDL_EVENTDEV) += opdl_evdev_init.c
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_OPDL_EVENTDEV) += opdl_evdev_xstats.c
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_OPDL_EVENTDEV) += opdl_test.c
-
-# export include files
-SYMLINK-y-include +=
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/event/skeleton/Makefile b/drivers/event/skeleton/Makefile
deleted file mode 100644
index dc85ad3c4b..0000000000
--- a/drivers/event/skeleton/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2016 Cavium, Inc
-#
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-#
-# library name
-#
-LIB = librte_pmd_skeleton_event.a
-
-CFLAGS += $(WERROR_FLAGS)
-LDLIBS += -lrte_eal -lrte_eventdev
-LDLIBS += -lrte_pci -lrte_bus_pci
-LDLIBS += -lrte_bus_vdev
-
-EXPORT_MAP := rte_pmd_skeleton_event_version.map
-
-#
-# all source are stored in SRCS-y
-#
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_SKELETON_EVENTDEV) += skeleton_eventdev.c
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/event/sw/Makefile b/drivers/event/sw/Makefile
deleted file mode 100644
index 8ea5cceb8b..0000000000
--- a/drivers/event/sw/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2016-2017 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-# library name
-LIB = librte_pmd_sw_event.a
-
-# build flags
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS)
-LDLIBS += -lrte_eal -lrte_eventdev -lrte_kvargs -lrte_ring
-LDLIBS += -lrte_mempool -lrte_mbuf
-LDLIBS += -lrte_bus_vdev
-
-# versioning export map
-EXPORT_MAP := rte_pmd_sw_event_version.map
-
-# library source files
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_SW_EVENTDEV) += sw_evdev.c
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_SW_EVENTDEV) += sw_evdev_worker.c
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_SW_EVENTDEV) += sw_evdev_scheduler.c
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_SW_EVENTDEV) += sw_evdev_xstats.c
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_SW_EVENTDEV) += sw_evdev_selftest.c
-
-# export include files
-SYMLINK-y-include +=
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/mempool/Makefile b/drivers/mempool/Makefile
deleted file mode 100644
index 29ef73bf44..0000000000
--- a/drivers/mempool/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2017 NXP
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-DIRS-$(CONFIG_RTE_DRIVER_MEMPOOL_BUCKET) += bucket
-ifeq ($(CONFIG_RTE_LIBRTE_DPAA_BUS),y)
-DIRS-$(CONFIG_RTE_LIBRTE_DPAA_MEMPOOL) += dpaa
-endif
-ifeq ($(CONFIG_RTE_EAL_VFIO)$(CONFIG_RTE_LIBRTE_FSLMC_BUS),yy)
-DIRS-$(CONFIG_RTE_LIBRTE_DPAA2_MEMPOOL) += dpaa2
-endif
-DIRS-$(CONFIG_RTE_DRIVER_MEMPOOL_RING) += ring
-DIRS-$(CONFIG_RTE_DRIVER_MEMPOOL_STACK) += stack
-DIRS-$(CONFIG_RTE_LIBRTE_OCTEONTX_MEMPOOL) += octeontx
-DIRS-$(CONFIG_RTE_LIBRTE_OCTEONTX2_MEMPOOL) += octeontx2
-
-include $(RTE_SDK)/mk/rte.subdir.mk
diff --git a/drivers/mempool/bucket/Makefile b/drivers/mempool/bucket/Makefile
deleted file mode 100644
index c766c35b2c..0000000000
--- a/drivers/mempool/bucket/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-#
-# Copyright (c) 2017-2018 Solarflare Communications Inc.
-# All rights reserved.
-#
-# This software was jointly developed between OKTET Labs (under contract
-# for Solarflare) and Solarflare Communications, Inc.
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-#
-# library name
-#
-LIB = librte_mempool_bucket.a
-
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS)
-
-LDLIBS += -lrte_eal -lrte_mempool -lrte_ring
-
-EXPORT_MAP := rte_mempool_bucket_version.map
-
-SRCS-$(CONFIG_RTE_DRIVER_MEMPOOL_BUCKET) += rte_mempool_bucket.c
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/mempool/dpaa/Makefile b/drivers/mempool/dpaa/Makefile
deleted file mode 100644
index 144969c627..0000000000
--- a/drivers/mempool/dpaa/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2016 NXP
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-#
-# library name
-#
-LIB = librte_mempool_dpaa.a
-
-CFLAGS := -I$(SRCDIR) $(CFLAGS)
-CFLAGS += -O3 $(WERROR_FLAGS)
-CFLAGS += -I$(RTE_SDK)/drivers/bus/dpaa
-CFLAGS += -I$(RTE_SDK)/drivers/bus/dpaa/include/
-CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax
-CFLAGS += -I$(RTE_SDK)/drivers/mempool/dpaa
-CFLAGS += -I$(RTE_SDK)/lib/librte_mempool
-
-# versioning export map
-EXPORT_MAP := rte_mempool_dpaa_version.map
-
-# all source are stored in SRCS-y
-#
-SRCS-$(CONFIG_RTE_LIBRTE_DPAA_MEMPOOL) += dpaa_mempool.c
-
-LDLIBS += -lrte_bus_dpaa
-LDLIBS += -lrte_eal -lrte_mempool -lrte_ring
-LDLIBS += -lrte_common_dpaax
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/mempool/dpaa2/Makefile b/drivers/mempool/dpaa2/Makefile
deleted file mode 100644
index 04db6d27de..0000000000
--- a/drivers/mempool/dpaa2/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2016 NXP
-#
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-#
-# library name
-#
-LIB = librte_mempool_dpaa2.a
-
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS)
-CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc
-CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax
-CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc/qbman/include
-
-# versioning export map
-EXPORT_MAP := rte_mempool_dpaa2_version.map
-
-# all source are stored in SRCS-y
-#
-SRCS-$(CONFIG_RTE_LIBRTE_DPAA2_MEMPOOL) += dpaa2_hw_mempool.c
-
-LDLIBS += -lrte_bus_fslmc
-LDLIBS += -lrte_eal -lrte_mempool -lrte_ring
-LDLIBS += -lrte_common_dpaax
-
-SYMLINK-$(CONFIG_RTE_LIBRTE_DPAA2_MEMPOOL)-include := rte_dpaa2_mempool.h
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/mempool/octeontx/Makefile b/drivers/mempool/octeontx/Makefile
deleted file mode 100644
index 9c840620d9..0000000000
--- a/drivers/mempool/octeontx/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2017 Cavium, Inc
-#
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-#
-# library name
-#
-LIB = librte_mempool_octeontx.a
-
-CFLAGS += $(WERROR_FLAGS)
-CFLAGS += -I$(RTE_SDK)/drivers/common/octeontx/
-
-EXPORT_MAP := rte_mempool_octeontx_version.map
-
-#
-# all source are stored in SRCS-y
-#
-SRCS-$(CONFIG_RTE_LIBRTE_OCTEONTX_MEMPOOL) += octeontx_fpavf.c
-SRCS-$(CONFIG_RTE_LIBRTE_OCTEONTX_MEMPOOL) += rte_mempool_octeontx.c
-
-ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y)
-CFLAGS_rte_mempool_octeontx.o += -fno-prefetch-loop-arrays
-
-ifeq ($(shell test $(GCC_VERSION) -ge 46 && echo 1), 1)
-CFLAGS_rte_mempool_octeontx.o += -Ofast
-else
-CFLAGS_rte_mempool_octeontx.o += -O3 -ffast-math
-endif
-
-else
-CFLAGS_rte_mempool_octeontx.o += -Ofast
-endif
-
-LDLIBS += -lrte_eal -lrte_mempool -lrte_ring -lrte_mbuf
-LDLIBS += -lrte_bus_pci -lrte_common_octeontx
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/mempool/octeontx2/Makefile b/drivers/mempool/octeontx2/Makefile
deleted file mode 100644
index 3828219b11..0000000000
--- a/drivers/mempool/octeontx2/Makefile
+++ /dev/null
@@ -1,40 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(C) 2019 Marvell International Ltd.
-#
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-#
-# library name
-#
-LIB = librte_mempool_octeontx2.a
-
-CFLAGS += $(WERROR_FLAGS)
-CFLAGS += -I$(RTE_SDK)/drivers/common/octeontx2
-CFLAGS += -I$(RTE_SDK)/drivers/mempool/octeontx2
-CFLAGS += -I$(RTE_SDK)/drivers/bus/pci
-CFLAGS += -O3
-
-ifneq ($(CONFIG_RTE_ARCH_64),y)
-CFLAGS += -Wno-int-to-pointer-cast
-CFLAGS += -Wno-pointer-to-int-cast
-ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y)
-CFLAGS += -diag-disable 2259
-endif
-endif
-
-EXPORT_MAP := rte_mempool_octeontx2_version.map
-
-#
-# all source are stored in SRCS-y
-#
-SRCS-$(CONFIG_RTE_LIBRTE_OCTEONTX2_MEMPOOL) += \
-	otx2_mempool_ops.c	\
-	otx2_mempool.c 		\
-	otx2_mempool_irq.c	\
-	otx2_mempool_debug.c
-
-LDLIBS += -lrte_eal -lrte_mempool -lrte_mbuf
-LDLIBS += -lrte_common_octeontx2 -lrte_kvargs -lrte_bus_pci
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/mempool/ring/Makefile b/drivers/mempool/ring/Makefile
deleted file mode 100644
index 8624502da9..0000000000
--- a/drivers/mempool/ring/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2017 NXP
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-#
-# library name
-#
-LIB = librte_mempool_ring.a
-
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS)
-LDLIBS += -lrte_eal -lrte_mempool -lrte_ring
-
-EXPORT_MAP := rte_mempool_ring_version.map
-
-SRCS-$(CONFIG_RTE_DRIVER_MEMPOOL_RING) += rte_mempool_ring.c
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/mempool/stack/Makefile b/drivers/mempool/stack/Makefile
deleted file mode 100644
index ccfd970400..0000000000
--- a/drivers/mempool/stack/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2017 NXP
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-#
-# library name
-#
-LIB = librte_mempool_stack.a
-
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS)
-
-# Headers
-CFLAGS += -I$(RTE_SDK)/lib/librte_mempool
-LDLIBS += -lrte_eal -lrte_mempool -lrte_stack
-
-EXPORT_MAP := rte_mempool_stack_version.map
-
-SRCS-$(CONFIG_RTE_DRIVER_MEMPOOL_STACK) += rte_mempool_stack.c
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
deleted file mode 100644
index 361974eacf..0000000000
--- a/drivers/net/Makefile
+++ /dev/null
@@ -1,84 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2015 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-# set in mk/toolchain/xxx/rte.toolchain-compat.mk
-ifeq ($(CONFIG_RTE_LIBRTE_THUNDERX_NICVF_PMD),d)
-        $(warning thunderx pmd is not supported by old compilers)
-endif
-
-DIRS-$(CONFIG_RTE_LIBRTE_PMD_AF_PACKET) += af_packet
-DIRS-$(CONFIG_RTE_LIBRTE_PMD_AF_XDP) += af_xdp
-DIRS-$(CONFIG_RTE_LIBRTE_ARK_PMD) += ark
-DIRS-$(CONFIG_RTE_LIBRTE_ATLANTIC_PMD) += atlantic
-DIRS-$(CONFIG_RTE_LIBRTE_AVP_PMD) += avp
-DIRS-$(CONFIG_RTE_LIBRTE_AXGBE_PMD) += axgbe
-DIRS-$(CONFIG_RTE_LIBRTE_BNX2X_PMD) += bnx2x
-DIRS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += bonding
-DIRS-$(CONFIG_RTE_LIBRTE_CXGBE_PMD) += cxgbe
-ifeq ($(CONFIG_RTE_LIBRTE_DPAA_BUS),y)
-DIRS-$(CONFIG_RTE_LIBRTE_DPAA_PMD) += dpaa
-endif
-ifeq ($(CONFIG_RTE_EAL_VFIO)$(CONFIG_RTE_LIBRTE_FSLMC_BUS),yy)
-DIRS-$(CONFIG_RTE_LIBRTE_DPAA2_PMD) += dpaa2
-endif
-DIRS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += e1000
-DIRS-$(CONFIG_RTE_LIBRTE_ENA_PMD) += ena
-DIRS-$(CONFIG_RTE_LIBRTE_ENETC_PMD) += enetc
-DIRS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += enic
-DIRS-$(CONFIG_RTE_LIBRTE_PMD_FAILSAFE) += failsafe
-DIRS-$(CONFIG_RTE_LIBRTE_FM10K_PMD) += fm10k
-DIRS-$(CONFIG_RTE_LIBRTE_HINIC_PMD) += hinic
-DIRS-$(CONFIG_RTE_LIBRTE_HNS3_PMD) += hns3
-DIRS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += i40e
-DIRS-$(CONFIG_RTE_LIBRTE_IAVF_PMD) += iavf
-DIRS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice
-DIRS-$(CONFIG_RTE_LIBRTE_IGC_PMD) += igc
-DIRS-$(CONFIG_RTE_LIBRTE_IONIC_PMD) += ionic
-DIRS-$(CONFIG_RTE_LIBRTE_IPN3KE_PMD) += ipn3ke
-DIRS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe
-DIRS-$(CONFIG_RTE_LIBRTE_LIO_PMD) += liquidio
-DIRS-$(CONFIG_RTE_LIBRTE_PMD_MEMIF) += memif
-DIRS-$(CONFIG_RTE_LIBRTE_MLX4_PMD) += mlx4
-DIRS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5
-DIRS-$(CONFIG_RTE_LIBRTE_MVNETA_PMD) += mvneta
-DIRS-$(CONFIG_RTE_LIBRTE_MVPP2_PMD) += mvpp2
-DIRS-$(CONFIG_RTE_LIBRTE_NETVSC_PMD) += netvsc
-DIRS-$(CONFIG_RTE_LIBRTE_NFB_PMD) += nfb
-DIRS-$(CONFIG_RTE_LIBRTE_NFP_PMD) += nfp
-DIRS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += bnxt
-DIRS-$(CONFIG_RTE_LIBRTE_PMD_NULL) += null
-DIRS-$(CONFIG_RTE_LIBRTE_OCTEONTX_PMD) += octeontx
-DIRS-$(CONFIG_RTE_LIBRTE_OCTEONTX2_PMD) += octeontx2
-DIRS-$(CONFIG_RTE_LIBRTE_PMD_PCAP) += pcap
-DIRS-$(CONFIG_RTE_LIBRTE_PFE_PMD) += pfe
-DIRS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += qede
-DIRS-$(CONFIG_RTE_LIBRTE_PMD_RING) += ring
-DIRS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += sfc
-DIRS-$(CONFIG_RTE_LIBRTE_PMD_SZEDATA2) += szedata2
-DIRS-$(CONFIG_RTE_LIBRTE_PMD_TAP) += tap
-DIRS-$(CONFIG_RTE_LIBRTE_THUNDERX_NICVF_PMD) += thunderx
-DIRS-$(CONFIG_RTE_LIBRTE_VDEV_NETVSC_PMD) += vdev_netvsc
-DIRS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += virtio
-DIRS-$(CONFIG_RTE_LIBRTE_VMXNET3_PMD) += vmxnet3
-
-ifeq ($(CONFIG_RTE_LIBRTE_KNI),y)
-DIRS-$(CONFIG_RTE_LIBRTE_PMD_KNI) += kni
-endif
-
-ifeq ($(CONFIG_RTE_LIBRTE_SCHED),y)
-DIRS-$(CONFIG_RTE_LIBRTE_PMD_SOFTNIC) += softnic
-endif # $(CONFIG_RTE_LIBRTE_SCHED)
-
-ifeq ($(CONFIG_RTE_LIBRTE_VHOST),y)
-DIRS-$(CONFIG_RTE_LIBRTE_PMD_VHOST) += vhost
-endif # $(CONFIG_RTE_LIBRTE_VHOST)
-
-ifeq ($(CONFIG_RTE_LIBRTE_MVPP2_PMD),y)
-ifeq ($(CONFIG_RTE_LIBRTE_CFGFILE),n)
-$(error "RTE_LIBRTE_CFGFILE must be enabled in configuration!")
-endif
-endif
-
-include $(RTE_SDK)/mk/rte.subdir.mk
diff --git a/drivers/net/af_packet/Makefile b/drivers/net/af_packet/Makefile
deleted file mode 100644
index 91dbf0a692..0000000000
--- a/drivers/net/af_packet/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2014 John W. Linville <linville@redhat.com>
-# Copyright(c) 2010-2014 Intel Corporation.
-# Copyright(c) 2014 6WIND S.A.
-# All rights reserved.
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-#
-# library name
-#
-LIB = librte_pmd_af_packet.a
-
-EXPORT_MAP := rte_pmd_af_packet_version.map
-
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS)
-LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring
-LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs
-LDLIBS += -lrte_bus_vdev
-
-#
-# all source are stored in SRCS-y
-#
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_AF_PACKET) += rte_eth_af_packet.c
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/net/af_xdp/Makefile b/drivers/net/af_xdp/Makefile
deleted file mode 100644
index 55db6085ac..0000000000
--- a/drivers/net/af_xdp/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2019 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-#
-# library name
-#
-LIB = librte_pmd_af_xdp.a
-
-EXPORT_MAP := rte_pmd_af_xdp_version.map
-
-CFLAGS += -O3
-
-CFLAGS += $(WERROR_FLAGS)
-LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring
-LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs
-LDLIBS += -lrte_bus_vdev
-LDLIBS += $(shell command -v pkg-config > /dev/null 2>&1 && pkg-config --libs libbpf || echo "-lbpf")
-
-#
-# all source are stored in SRCS-y
-#
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_AF_XDP) += rte_eth_af_xdp.c
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/net/ark/Makefile b/drivers/net/ark/Makefile
deleted file mode 100644
index c02080bdd0..0000000000
--- a/drivers/net/ark/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright (c) 2015-2018 Atomic Rules LLC
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-#
-# library name
-#
-LIB = librte_pmd_ark.a
-
-CFLAGS += -O3 -I./
-CFLAGS += $(WERROR_FLAGS) -Werror
-
-EXPORT_MAP := rte_pmd_ark_version.map
-
-#
-# all source are stored in SRCS-y
-#
-SRCS-$(CONFIG_RTE_LIBRTE_ARK_PMD) += ark_ddm.c
-SRCS-$(CONFIG_RTE_LIBRTE_ARK_PMD) += ark_ethdev.c
-SRCS-$(CONFIG_RTE_LIBRTE_ARK_PMD) += ark_ethdev_rx.c
-SRCS-$(CONFIG_RTE_LIBRTE_ARK_PMD) += ark_ethdev_tx.c
-SRCS-$(CONFIG_RTE_LIBRTE_ARK_PMD) += ark_mpu.c
-SRCS-$(CONFIG_RTE_LIBRTE_ARK_PMD) += ark_pktchkr.c
-SRCS-$(CONFIG_RTE_LIBRTE_ARK_PMD) += ark_pktdir.c
-SRCS-$(CONFIG_RTE_LIBRTE_ARK_PMD) += ark_pktgen.c
-SRCS-$(CONFIG_RTE_LIBRTE_ARK_PMD) += ark_rqp.c
-SRCS-$(CONFIG_RTE_LIBRTE_ARK_PMD) += ark_udm.c
-
-# this lib depends upon:
-LDLIBS += -lpthread
-ifdef CONFIG_RTE_EXEC_ENV_LINUX
-LDLIBS += -ldl
-endif
-LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring
-LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs
-LDLIBS += -lrte_bus_pci
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/net/atlantic/Makefile b/drivers/net/atlantic/Makefile
deleted file mode 100644
index 0d0d0a502d..0000000000
--- a/drivers/net/atlantic/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2018 Aquantia Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-#
-# library name
-#
-LIB = librte_pmd_atlantic.a
-
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS)
-
-EXPORT_MAP := rte_pmd_atlantic_version.map
-
-LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring
-LDLIBS += -lrte_ethdev -lrte_net
-LDLIBS += -lrte_bus_pci
-
-VPATH += $(SRCDIR)/hw_atl
-
-#
-# all source are stored in SRCS-y
-#
-SRCS-$(CONFIG_RTE_LIBRTE_ATLANTIC_PMD) += atl_rxtx.c
-SRCS-$(CONFIG_RTE_LIBRTE_ATLANTIC_PMD) += atl_ethdev.c
-SRCS-$(CONFIG_RTE_LIBRTE_ATLANTIC_PMD) += atl_hw_regs.c
-SRCS-$(CONFIG_RTE_LIBRTE_ATLANTIC_PMD) += hw_atl_utils.c
-SRCS-$(CONFIG_RTE_LIBRTE_ATLANTIC_PMD) += hw_atl_llh.c
-SRCS-$(CONFIG_RTE_LIBRTE_ATLANTIC_PMD) += hw_atl_utils_fw2x.c
-SRCS-$(CONFIG_RTE_LIBRTE_ATLANTIC_PMD) += hw_atl_b0.c
-SRCS-$(CONFIG_RTE_LIBRTE_ATLANTIC_PMD) += rte_pmd_atlantic.c
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/net/avp/Makefile b/drivers/net/avp/Makefile
deleted file mode 100644
index 075247b13a..0000000000
--- a/drivers/net/avp/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2013-2017, Wind River Systems, Inc.
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-#
-# library name
-#
-LIB = librte_pmd_avp.a
-
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR)
-LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring
-LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs
-LDLIBS += -lrte_bus_pci
-
-EXPORT_MAP := rte_pmd_avp_version.map
-
-# install public header files to enable compilation of the hypervisor level
-# dpdk application
-SYMLINK-$(CONFIG_RTE_LIBRTE_AVP_PMD)-include += rte_avp_common.h
-SYMLINK-$(CONFIG_RTE_LIBRTE_AVP_PMD)-include += rte_avp_fifo.h
-
-#
-# all source files are stored in SRCS-y
-#
-SRCS-$(CONFIG_RTE_LIBRTE_AVP_PMD) += avp_ethdev.c
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/net/axgbe/Makefile b/drivers/net/axgbe/Makefile
deleted file mode 100644
index e421d0da11..0000000000
--- a/drivers/net/axgbe/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@ 
-#   SPDX-License-Identifier: BSD-3-Clause
-#   Copyright (c) 2018 Advanced Micro Devices, Inc. All rights reserved.
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-#
-# library name
-#
-LIB = librte_pmd_axgbe.a
-
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS)
-
-EXPORT_MAP := rte_pmd_axgbe_version.map
-
-LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool
-LDLIBS += -lrte_pci -lrte_bus_pci
-LDLIBS += -lrte_ethdev -lrte_net
-
-#
-# all source are stored in SRCS-y
-#
-SRCS-$(CONFIG_RTE_LIBRTE_AXGBE_PMD) += axgbe_ethdev.c
-SRCS-$(CONFIG_RTE_LIBRTE_AXGBE_PMD) += axgbe_dev.c
-SRCS-$(CONFIG_RTE_LIBRTE_AXGBE_PMD) += axgbe_mdio.c
-SRCS-$(CONFIG_RTE_LIBRTE_AXGBE_PMD) += axgbe_phy_impl.c
-SRCS-$(CONFIG_RTE_LIBRTE_AXGBE_PMD) += axgbe_i2c.c
-SRCS-$(CONFIG_RTE_LIBRTE_AXGBE_PMD) += axgbe_rxtx.c
-ifeq ($(CONFIG_RTE_ARCH_X86),y)
-SRCS-$(CONFIG_RTE_LIBRTE_AXGBE_PMD) += axgbe_rxtx_vec_sse.c
-endif
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/net/bnx2x/Makefile b/drivers/net/bnx2x/Makefile
deleted file mode 100644
index 451434cc18..0000000000
--- a/drivers/net/bnx2x/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright (c) 2014 - 2018 Cavium Inc.
-# All rights reserved.
-# www.cavium.com
-include $(RTE_SDK)/mk/rte.vars.mk
-
-#
-# library name
-#
-LIB = librte_pmd_bnx2x.a
-
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS)
-CFLAGS += -DZLIB_CONST
-LDLIBS += -lz
-LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring
-LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs
-LDLIBS += -lrte_bus_pci
-
-EXPORT_MAP := rte_pmd_bnx2x_version.map
-
-#
-# all source are stored in SRCS-y
-#
-SRCS-$(CONFIG_RTE_LIBRTE_BNX2X_PMD) += bnx2x.c
-SRCS-$(CONFIG_RTE_LIBRTE_BNX2X_PMD) += bnx2x_rxtx.c
-SRCS-$(CONFIG_RTE_LIBRTE_BNX2X_PMD) += bnx2x_stats.c
-SRCS-$(CONFIG_RTE_LIBRTE_BNX2X_PMD) += bnx2x_ethdev.c
-SRCS-$(CONFIG_RTE_LIBRTE_BNX2X_PMD) += ecore_sp.c
-SRCS-$(CONFIG_RTE_LIBRTE_BNX2X_PMD) += elink.c
-SRCS-$(CONFIG_RTE_LIBRTE_BNX2X_PMD) += bnx2x_vfpf.c
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/net/bnxt/Makefile b/drivers/net/bnxt/Makefile
deleted file mode 100644
index 0c5b74918d..0000000000
--- a/drivers/net/bnxt/Makefile
+++ /dev/null
@@ -1,63 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation.
-# Copyright(c) 2014 6WIND S.A.
-# Copyright(c) Broadcom Limited.
-# All rights reserved.
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-#
-# library name
-#
-LIB = librte_pmd_bnxt.a
-
-EXPORT_MAP := rte_pmd_bnxt_version.map
-
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS)
-LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring
-LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs
-LDLIBS += -lrte_bus_pci -pthread
-
-EXPORT_MAP := rte_pmd_bnxt_version.map
-
-#
-# all source are stored in SRCS-y
-#
-SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += bnxt_cpr.c
-SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += bnxt_ethdev.c
-SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += bnxt_filter.c
-SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += bnxt_flow.c
-SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += bnxt_hwrm.c
-SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += bnxt_ring.c
-SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += bnxt_rxq.c
-SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += bnxt_rxr.c
-SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += bnxt_stats.c
-SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += bnxt_txq.c
-SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += bnxt_txr.c
-SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += bnxt_vnic.c
-SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += bnxt_irq.c
-SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += bnxt_util.c
-SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += bnxt_reps.c
-SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += rte_pmd_bnxt.c
-ifeq ($(CONFIG_RTE_ARCH_X86), y)
-SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += bnxt_rxtx_vec_sse.c
-endif
-ifeq ($(CONFIG_RTE_ARCH_ARM64), y)
-SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += bnxt_rxtx_vec_neon.c
-endif
-
-ifeq ($(CONFIG_RTE_LIBRTE_BNXT_PMD), y)
-CFLAGS += -I$(SRCDIR) -I$(SRCDIR)/tf_ulp -I$(SRCDIR)/tf_core -I$(SRCDIR)/hcapi
-include $(SRCDIR)/tf_ulp/Makefile
-include $(SRCDIR)/tf_core/Makefile
-include $(SRCDIR)/hcapi/Makefile
-endif
-
-#
-# Export include files
-#
-SYMLINK-y-include +=
-SYMLINK-$(CONFIG_RTE_LIBRTE_BNXT_PMD)-include += rte_pmd_bnxt.h
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/net/bnxt/hcapi/Makefile b/drivers/net/bnxt/hcapi/Makefile
deleted file mode 100644
index a5bb398ad7..0000000000
--- a/drivers/net/bnxt/hcapi/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2019-2020 Broadcom Limited.
-# All rights reserved.
-
-SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += hcapi/hcapi_cfa_p4.c
diff --git a/drivers/net/bnxt/tf_core/Makefile b/drivers/net/bnxt/tf_core/Makefile
deleted file mode 100644
index 84840366ab..0000000000
--- a/drivers/net/bnxt/tf_core/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation.
-# Copyright(c) 2014 6WIND S.A.
-# Copyright(c) Broadcom Limited.
-# All rights reserved.
-
-
-SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/bitalloc.c
-SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/rand.c
-SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/stack.c
-SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/ll.c
-SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_core.c
-SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_rm.c
-SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tfp.c
-SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_msg.c
-SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_tbl.c
-SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_em_common.c
-SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_em_internal.c
-SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_em_host.c
-SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_session.c
-SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_device.c
-SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_device_p4.c
-SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_identifier.c
-SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_shadow_tbl.c
-SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_shadow_tcam.c
-SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_tcam.c
-SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_util.c
-SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_if_tbl.c
-SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_global_cfg.c
-SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_shadow_identifier.c
-SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_core/tf_hash.c
diff --git a/drivers/net/bnxt/tf_ulp/Makefile b/drivers/net/bnxt/tf_ulp/Makefile
deleted file mode 100644
index abb68150d1..0000000000
--- a/drivers/net/bnxt/tf_ulp/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation.
-# Copyright(c) 2014 6WIND S.A.
-# Copyright(c) Broadcom Limited.
-# All rights reserved.
-
-SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_ulp/ulp_template_db_tbl.c
-SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_ulp/ulp_template_db_class.c
-SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_ulp/ulp_template_db_act.c
-SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_ulp/ulp_rte_parser.c
-SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_ulp/bnxt_ulp_flow.c
-SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_ulp/ulp_matcher.c
-SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_ulp/ulp_utils.c
-SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_ulp/ulp_mapper.c
-SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_ulp/bnxt_ulp.c
-SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_ulp/ulp_mark_mgr.c
-SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_ulp/ulp_flow_db.c
-SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_ulp/ulp_port_db.c
-SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_ulp/ulp_def_rules.c
-SRCS-$(CONFIG_RTE_LIBRTE_BNXT_PMD) += tf_ulp/ulp_fc_mgr.c
diff --git a/drivers/net/bonding/Makefile b/drivers/net/bonding/Makefile
deleted file mode 100644
index 728551a846..0000000000
--- a/drivers/net/bonding/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-#
-# library name
-#
-LIB = librte_pmd_bond.a
-
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS)
-LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring
-LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs
-LDLIBS += -lrte_pci -lrte_bus_pci
-LDLIBS += -lrte_bus_vdev
-
-EXPORT_MAP := rte_pmd_bond_version.map
-
-#
-# all source are stored in SRCS-y
-#
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += rte_eth_bond_api.c
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += rte_eth_bond_pmd.c
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += rte_eth_bond_args.c
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += rte_eth_bond_8023ad.c
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += rte_eth_bond_alb.c
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += rte_eth_bond_flow.c
-
-#
-# Export include files
-#
-SYMLINK-y-include += rte_eth_bond.h
-SYMLINK-y-include += rte_eth_bond_8023ad.h
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/net/cxgbe/Makefile b/drivers/net/cxgbe/Makefile
deleted file mode 100644
index 53b2bb56dc..0000000000
--- a/drivers/net/cxgbe/Makefile
+++ /dev/null
@@ -1,57 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2014-2018 Chelsio Communications.
-# All rights reserved.
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-#
-# library name
-#
-LIB = librte_pmd_cxgbe.a
-
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS)
-
-EXPORT_MAP := rte_pmd_cxgbe_version.map
-
-#
-# CFLAGS for gcc/clang
-#
-ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y)
-ifeq ($(shell test $(GCC_VERSION) -ge 44 && echo 1), 1)
-CFLAGS     += -Wno-deprecated
-endif
-endif
-
-LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring
-LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs
-LDLIBS += -lrte_bus_pci
-
-#
-# Add extra flags for base driver files (also known as shared code)
-# to disable warnings in them
-#
-BASE_DRIVER_OBJS=$(sort $(patsubst %.c,%.o,$(notdir $(wildcard $(SRCDIR)/base/*.c))))
-$(foreach obj, $(BASE_DRIVER_OBJS), $(eval CFLAGS_$(obj)+=$(CFLAGS_BASE_DRIVER)))
-
-VPATH += $(SRCDIR)/base
-
-
-#
-# all source are stored in SRCS-y
-#
-SRCS-$(CONFIG_RTE_LIBRTE_CXGBE_PMD) += cxgbe_ethdev.c
-SRCS-$(CONFIG_RTE_LIBRTE_CXGBE_PMD) += cxgbevf_ethdev.c
-SRCS-$(CONFIG_RTE_LIBRTE_CXGBE_PMD) += cxgbe_main.c
-SRCS-$(CONFIG_RTE_LIBRTE_CXGBE_PMD) += cxgbevf_main.c
-SRCS-$(CONFIG_RTE_LIBRTE_CXGBE_PMD) += sge.c
-SRCS-$(CONFIG_RTE_LIBRTE_CXGBE_PMD) += cxgbe_filter.c
-SRCS-$(CONFIG_RTE_LIBRTE_CXGBE_PMD) += cxgbe_flow.c
-SRCS-$(CONFIG_RTE_LIBRTE_CXGBE_PMD) += t4_hw.c
-SRCS-$(CONFIG_RTE_LIBRTE_CXGBE_PMD) += clip_tbl.c
-SRCS-$(CONFIG_RTE_LIBRTE_CXGBE_PMD) += mps_tcam.c
-SRCS-$(CONFIG_RTE_LIBRTE_CXGBE_PMD) += l2t.c
-SRCS-$(CONFIG_RTE_LIBRTE_CXGBE_PMD) += smt.c
-SRCS-$(CONFIG_RTE_LIBRTE_CXGBE_PMD) += t4vf_hw.c
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/net/dpaa/Makefile b/drivers/net/dpaa/Makefile
deleted file mode 100644
index d7bbc0e158..0000000000
--- a/drivers/net/dpaa/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2017 NXP
-#
-
-include $(RTE_SDK)/mk/rte.vars.mk
-RTE_SDK_DPAA=$(RTE_SDK)/drivers/net/dpaa
-
-#
-# library name
-#
-LIB = librte_pmd_dpaa.a
-
-CFLAGS := -I$(SRCDIR) $(CFLAGS)
-CFLAGS += -O3 $(WERROR_FLAGS)
-CFLAGS += -Wno-pointer-arith
-CFLAGS += -I$(RTE_SDK_DPAA)/
-CFLAGS += -I$(RTE_SDK_DPAA)/include
-CFLAGS += -I$(RTE_SDK)/drivers/bus/dpaa
-CFLAGS += -I$(RTE_SDK)/drivers/bus/dpaa/include/
-CFLAGS += -I$(RTE_SDK)/drivers/bus/dpaa/base/qbman
-CFLAGS += -I$(RTE_SDK)/drivers/mempool/dpaa
-CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax
-CFLAGS += -I$(RTE_SDK)/drivers/event/dpaa
-CFLAGS += -I$(RTE_SDK)/lib/librte_eal/include
-
-EXPORT_MAP := rte_pmd_dpaa_version.map
-
-# Interfaces with DPDK
-SRCS-$(CONFIG_RTE_LIBRTE_DPAA_PMD) += dpaa_ethdev.c
-SRCS-$(CONFIG_RTE_LIBRTE_DPAA_PMD) += dpaa_rxtx.c
-
-LDLIBS += -lrte_bus_dpaa
-LDLIBS += -lrte_mempool_dpaa
-LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring
-LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs
-LDLIBS += -lrte_common_dpaax
-
-# install this header file
-SYMLINK-$(CONFIG_RTE_LIBRTE_DPAA_PMD)-include := rte_pmd_dpaa.h
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/net/dpaa2/Makefile b/drivers/net/dpaa2/Makefile
deleted file mode 100644
index 6f38c18b9b..0000000000
--- a/drivers/net/dpaa2/Makefile
+++ /dev/null
@@ -1,47 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright (c) 2016 Freescale Semiconductor, Inc. All rights reserved.
-# Copyright 2016-2019 NXP
-#
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-#
-# library name
-#
-LIB = librte_pmd_dpaa2.a
-
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS)
-CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax
-CFLAGS += -I$(RTE_SDK)/drivers/net/dpaa2
-CFLAGS += -I$(RTE_SDK)/drivers/net/dpaa2/mc
-CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc
-CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc/qbman/include
-CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc/mc
-CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc/portal
-CFLAGS += -I$(RTE_SDK)/drivers/mempool/dpaa2
-
-# versioning export map
-EXPORT_MAP := rte_pmd_dpaa2_version.map
-
-SRCS-$(CONFIG_RTE_LIBRTE_DPAA2_PMD) += base/dpaa2_hw_dpni.c
-SRCS-$(CONFIG_RTE_LIBRTE_DPAA2_PMD) += dpaa2_rxtx.c
-SRCS-$(CONFIG_RTE_LIBRTE_DPAA2_PMD) += dpaa2_ethdev.c
-SRCS-$(CONFIG_RTE_LIBRTE_DPAA2_PMD) += dpaa2_flow.c
-SRCS-$(CONFIG_RTE_LIBRTE_DPAA2_PMD) += dpaa2_mux.c
-SRCS-$(CONFIG_RTE_LIBRTE_DPAA2_PMD) += dpaa2_sparser.c
-SRCS-$(CONFIG_RTE_LIBRTE_DPAA2_PMD) += mc/dpni.c
-SRCS-$(CONFIG_RTE_LIBRTE_DPAA2_PMD) += mc/dpkg.c
-SRCS-$(CONFIG_RTE_LIBRTE_DPAA2_PMD) += mc/dpdmux.c
-SRCS-$(CONFIG_RTE_LIBRTE_IEEE1588)  += mc/dprtc.c
-SRCS-$(CONFIG_RTE_LIBRTE_IEEE1588)  += dpaa2_ptp.c
-
-LDLIBS += -lrte_bus_fslmc
-LDLIBS += -lrte_mempool_dpaa2
-LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring
-LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs
-LDLIBS += -lrte_common_dpaax
-
-# install this header file
-SYMLINK-$(CONFIG_RTE_LIBRTE_DPAA2_PMD)-include := rte_pmd_dpaa2.h
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/net/e1000/Makefile b/drivers/net/e1000/Makefile
deleted file mode 100644
index f186f8d0e9..0000000000
--- a/drivers/net/e1000/Makefile
+++ /dev/null
@@ -1,79 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2015 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-#
-# library name
-#
-LIB = librte_pmd_e1000.a
-
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS)
-LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring
-LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs
-LDLIBS += -lrte_bus_pci
-
-EXPORT_MAP := rte_pmd_e1000_version.map
-
-ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y)
-#
-# CFLAGS for icc
-#
-CFLAGS_BASE_DRIVER  = -diag-disable 177 -diag-disable 181
-CFLAGS_BASE_DRIVER += -diag-disable 869 -diag-disable 2259
-else
-#
-# CFLAGS for gcc/clang
-#
-CFLAGS_BASE_DRIVER = -Wno-uninitialized -Wno-unused-parameter
-CFLAGS_BASE_DRIVER += -Wno-unused-variable
-ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y)
-ifeq ($(shell test $(GCC_VERSION) -ge 60 && echo 1), 1)
-CFLAGS_BASE_DRIVER += -Wno-misleading-indentation
-ifeq ($(shell test $(GCC_VERSION) -ge 70 && echo 1), 1)
-CFLAGS_BASE_DRIVER += -Wno-implicit-fallthrough
-endif
-endif
-endif
-endif
-
-#
-# Add extra flags for base driver files (also known as shared code)
-# to disable warnings in them
-#
-BASE_DRIVER_OBJS=$(sort $(patsubst %.c,%.o,$(notdir $(wildcard $(SRCDIR)/base/*.c))))
-$(foreach obj, $(BASE_DRIVER_OBJS), $(eval CFLAGS_$(obj)+=$(CFLAGS_BASE_DRIVER)))
-
-VPATH += $(SRCDIR)/base
-
-#
-# all source are stored in SRCS-y
-#
-SRCS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += e1000_base.c
-SRCS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += e1000_80003es2lan.c
-SRCS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += e1000_82540.c
-SRCS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += e1000_82541.c
-SRCS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += e1000_82542.c
-SRCS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += e1000_82543.c
-SRCS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += e1000_82571.c
-SRCS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += e1000_82575.c
-SRCS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += e1000_i210.c
-SRCS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += e1000_api.c
-SRCS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += e1000_ich8lan.c
-SRCS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += e1000_logs.c
-SRCS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += e1000_mac.c
-SRCS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += e1000_manage.c
-SRCS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += e1000_mbx.c
-SRCS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += e1000_nvm.c
-SRCS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += e1000_osdep.c
-SRCS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += e1000_phy.c
-SRCS-$(CONFIG_RTE_LIBRTE_E1000_PMD) += e1000_vf.c
-SRCS-$(CONFIG_RTE_LIBRTE_IGB_PMD) += igb_ethdev.c
-SRCS-$(CONFIG_RTE_LIBRTE_IGB_PMD) += igb_rxtx.c
-SRCS-$(CONFIG_RTE_LIBRTE_IGB_PMD) += igb_pf.c
-SRCS-$(CONFIG_RTE_LIBRTE_IGB_PMD) += igb_flow.c
-SRCS-$(CONFIG_RTE_LIBRTE_EM_PMD) += em_ethdev.c
-SRCS-$(CONFIG_RTE_LIBRTE_EM_PMD) += em_rxtx.c
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/net/ena/Makefile b/drivers/net/ena/Makefile
deleted file mode 100644
index 8ccff36db7..0000000000
--- a/drivers/net/ena/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright (c) 2015-2019 Amazon.com, Inc. or its affiliates.
-# All rights reserved.
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-#
-# library name
-#
-LIB = librte_pmd_ena.a
-CFLAGS += $(WERROR_FLAGS) -O2
-INCLUDES :=-I$(SRCDIR) -I$(SRCDIR)/base/ena_defs -I$(SRCDIR)/base
-
-EXPORT_MAP := rte_pmd_ena_version.map
-
-VPATH += $(SRCDIR)/base
-#
-# all source are stored in SRCS-y
-#
-SRCS-$(CONFIG_RTE_LIBRTE_ENA_PMD) += ena_ethdev.c
-SRCS-$(CONFIG_RTE_LIBRTE_ENA_PMD) += ena_com.c
-SRCS-$(CONFIG_RTE_LIBRTE_ENA_PMD) += ena_eth_com.c
-
-CFLAGS += $(INCLUDES)
-LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring
-LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs
-LDLIBS += -lrte_bus_pci
-LDLIBS += -lrte_timer
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/net/enetc/Makefile b/drivers/net/enetc/Makefile
deleted file mode 100644
index 7276026e37..0000000000
--- a/drivers/net/enetc/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2018 NXP
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-#
-# library name
-#
-LIB = librte_pmd_enetc.a
-
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS)
-CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax
-EXPORT_MAP := rte_pmd_enetc_version.map
-SRCS-$(CONFIG_RTE_LIBRTE_ENETC_PMD) += enetc_ethdev.c
-SRCS-$(CONFIG_RTE_LIBRTE_ENETC_PMD) += enetc_rxtx.c
-
-LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool
-LDLIBS += -lrte_ethdev -lrte_net
-LDLIBS += -lrte_bus_pci
-LDLIBS += -lrte_common_dpaax
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/net/enic/Makefile b/drivers/net/enic/Makefile
deleted file mode 100644
index d098a474a1..0000000000
--- a/drivers/net/enic/Makefile
+++ /dev/null
@@ -1,68 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2008-2017 Cisco Systems, Inc.  All rights reserved.
-# Copyright 2007 Nuova Systems, Inc.  All rights reserved.
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-#
-# library name
-#
-LIB = librte_pmd_enic.a
-
-EXPORT_MAP := rte_pmd_enic_version.map
-
-CFLAGS += -I$(SRCDIR)/base/
-CFLAGS += -I$(SRCDIR)
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS) -Wno-strict-aliasing
-LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring
-LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -lrte_hash
-LDLIBS += -lrte_bus_pci
-
-VPATH += $(SRCDIR)/src
-
-#
-# all source are stored in SRCS-y
-#
-SRCS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += enic_ethdev.c
-SRCS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += enic_main.c
-SRCS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += enic_rxtx.c
-SRCS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += enic_clsf.c
-SRCS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += enic_res.c
-SRCS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += enic_flow.c
-SRCS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += enic_fm_flow.c
-SRCS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += base/vnic_cq.c
-SRCS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += base/vnic_wq.c
-SRCS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += base/vnic_dev.c
-SRCS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += base/vnic_intr.c
-SRCS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += base/vnic_rq.c
-
-# The current implementation assumes 64-bit pointers
-CC_AVX2_SUPPORT=0
-ifeq ($(CONFIG_RTE_ARCH_X86_64),y)
-# Figure out if the compiler supports avx2. The extra check using
-# -march=core-avx2 is necessary to support users who build for the
-# 'default' machine (corei7 which has no avx2) and run the binary on
-# newer CPUs that have avx2.
-# This part is verbatim from i40e makefile.
-ifeq ($(findstring RTE_MACHINE_CPUFLAG_AVX2,$(CFLAGS)),RTE_MACHINE_CPUFLAG_AVX2)
-	CC_AVX2_SUPPORT=1
-else
-	CC_AVX2_SUPPORT=\
-	$(shell $(CC) -march=core-avx2 -dM -E - </dev/null 2>&1 | \
-	grep -q AVX2 && echo 1)
-	ifeq ($(CC_AVX2_SUPPORT), 1)
-		ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y)
-			CFLAGS_enic_rxtx_vec_avx2.o += -march=core-avx2
-		else
-			CFLAGS_enic_rxtx_vec_avx2.o += -mavx2
-		endif
-	endif
-endif
-endif
-
-ifeq ($(CC_AVX2_SUPPORT), 1)
-	SRCS-$(CONFIG_RTE_LIBRTE_ENIC_PMD) += enic_rxtx_vec_avx2.c
-endif
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/net/failsafe/Makefile b/drivers/net/failsafe/Makefile
deleted file mode 100644
index 464fd0515d..0000000000
--- a/drivers/net/failsafe/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2017 6WIND S.A.
-# Copyright 2017 Mellanox Technologies, Ltd
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-# Library name
-LIB = librte_pmd_failsafe.a
-
-EXPORT_MAP := rte_pmd_failsafe_version.map
-
-# Sources are stored in SRCS-y
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_FAILSAFE) += failsafe.c
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_FAILSAFE) += failsafe_args.c
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_FAILSAFE) += failsafe_eal.c
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_FAILSAFE) += failsafe_ops.c
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_FAILSAFE) += failsafe_rxtx.c
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_FAILSAFE) += failsafe_ether.c
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_FAILSAFE) += failsafe_flow.c
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_FAILSAFE) += failsafe_intr.c
-ifeq ($(CONFIG_RTE_EXEC_ENV_LINUX),y)
-CFLAGS += -DLINUX
-else
-CFLAGS += -DBSD
-endif
-
-# No exported include files
-
-# Basic CFLAGS:
-CFLAGS += -std=gnu99 -Wextra
-CFLAGS += -O3
-CFLAGS += -I.
-CFLAGS += -D_DEFAULT_SOURCE
-CFLAGS += -D_XOPEN_SOURCE=700
-CFLAGS += $(WERROR_FLAGS)
-CFLAGS += -Wno-strict-prototypes
-CFLAGS += -pedantic
-LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring
-LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs
-LDLIBS += -lrte_bus_vdev
-LDLIBS += -lpthread
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/net/fm10k/Makefile b/drivers/net/fm10k/Makefile
deleted file mode 100644
index d486389928..0000000000
--- a/drivers/net/fm10k/Makefile
+++ /dev/null
@@ -1,77 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2013-2015 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-#
-# library name
-#
-LIB = librte_pmd_fm10k.a
-
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS)
-
-EXPORT_MAP := rte_pmd_fm10k_version.map
-
-ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y)
-#
-# CFLAGS for icc
-#
-CFLAGS_BASE_DRIVER  = -diag-disable 174 -diag-disable 593 -diag-disable 869
-CFLAGS_BASE_DRIVER += -diag-disable 981 -diag-disable 2259
-
-else ifeq ($(CONFIG_RTE_TOOLCHAIN_CLANG),y)
-
-#
-## CFLAGS for clang
-#
-CFLAGS_BASE_DRIVER = -Wno-unused-parameter -Wno-unused-value
-CFLAGS_BASE_DRIVER += -Wno-strict-aliasing -Wno-format-extra-args
-CFLAGS_BASE_DRIVER += -Wno-unused-variable
-
-else
-#
-# CFLAGS for gcc
-#
-CFLAGS_BASE_DRIVER = -Wno-unused-parameter -Wno-unused-value
-CFLAGS_BASE_DRIVER += -Wno-strict-aliasing -Wno-format-extra-args
-CFLAGS_BASE_DRIVER += -Wno-unused-variable
-
-ifeq ($(shell test $(GCC_VERSION) -ge 44 && echo 1), 1)
-CFLAGS     += -Wno-deprecated
-CFLAGS_BASE_DRIVER += -Wno-unused-but-set-variable
-ifeq ($(shell test $(GCC_VERSION) -ge 70 && echo 1), 1)
-CFLAGS_BASE_DRIVER += -Wno-implicit-fallthrough
-endif
-endif
-endif
-LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring
-LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -lrte_hash
-LDLIBS += -lrte_bus_pci
-
-#
-# Add extra flags for base driver source files to disable warnings in them
-#
-BASE_DRIVER_OBJS=$(sort $(patsubst %.c,%.o,$(notdir $(wildcard $(SRCDIR)/base/*.c))))
-$(foreach obj, $(BASE_DRIVER_OBJS), $(eval CFLAGS_$(obj)+=$(CFLAGS_BASE_DRIVER)))
-
-VPATH += $(SRCDIR)/base
-
-#
-# all source are stored in SRCS-y
-# base driver is based on the package of cid-fm10k.2017.01.24.tar.gz
-#
-SRCS-$(CONFIG_RTE_LIBRTE_FM10K_PMD) += fm10k_ethdev.c
-SRCS-$(CONFIG_RTE_LIBRTE_FM10K_PMD) += fm10k_rxtx.c
-
-SRCS-$(CONFIG_RTE_LIBRTE_FM10K_PMD) += fm10k_pf.c
-SRCS-$(CONFIG_RTE_LIBRTE_FM10K_PMD) += fm10k_tlv.c
-SRCS-$(CONFIG_RTE_LIBRTE_FM10K_PMD) += fm10k_common.c
-SRCS-$(CONFIG_RTE_LIBRTE_FM10K_PMD) += fm10k_mbx.c
-SRCS-$(CONFIG_RTE_LIBRTE_FM10K_PMD) += fm10k_vf.c
-SRCS-$(CONFIG_RTE_LIBRTE_FM10K_PMD) += fm10k_api.c
-ifeq ($(CONFIG_RTE_ARCH_X86), y)
-SRCS-$(CONFIG_RTE_LIBRTE_FM10K_INC_VECTOR) += fm10k_rxtx_vec.c
-endif
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/net/hinic/Makefile b/drivers/net/hinic/Makefile
deleted file mode 100644
index 87fd843e41..0000000000
--- a/drivers/net/hinic/Makefile
+++ /dev/null
@@ -1,67 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2017 Huawei Technologies Co., Ltd
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-#
-# library name
-#
-LIB = librte_pmd_hinic.a
-
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS)
-
-ifeq ($(CONFIG_RTE_ARCH_ARM64),y)
-CFLAGS += -D__ARM64_NEON__
-else ifeq ($(CONFIG_RTE_ARCH_X86_64),y)
-CFLAGS += -D__X86_64_SSE__
-endif
-
-LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring
-LDLIBS += -lrte_ethdev -lrte_net -lrte_hash
-LDLIBS += -lrte_bus_pci
-LDLIBS += -lpthread
-
-EXPORT_MAP := rte_pmd_hinic_version.map
-
-#
-# CFLAGS for 32-bits platforms
-#
-ifneq ($(CONFIG_RTE_ARCH_64),y)
-ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y)
-#
-# CFLAGS for icc
-#
-CFLAGS += -diag-disable 2259
-else
-#
-# CFLAGS for gcc
-#
-CFLAGS += -Wno-int-to-pointer-cast
-CFLAGS += -Wno-pointer-to-int-cast
-endif
-endif
-
-VPATH += $(SRCDIR)/base
-
-#
-# all source are stored in SRCS-y
-#
-SRCS-$(CONFIG_RTE_LIBRTE_HINIC_PMD) += hinic_pmd_api_cmd.c
-SRCS-$(CONFIG_RTE_LIBRTE_HINIC_PMD) += hinic_pmd_cfg.c
-SRCS-$(CONFIG_RTE_LIBRTE_HINIC_PMD) += hinic_pmd_cmdq.c
-SRCS-$(CONFIG_RTE_LIBRTE_HINIC_PMD) += hinic_pmd_eqs.c
-SRCS-$(CONFIG_RTE_LIBRTE_HINIC_PMD) += hinic_pmd_hwdev.c
-SRCS-$(CONFIG_RTE_LIBRTE_HINIC_PMD) += hinic_pmd_hwif.c
-SRCS-$(CONFIG_RTE_LIBRTE_HINIC_PMD) += hinic_pmd_mgmt.c
-SRCS-$(CONFIG_RTE_LIBRTE_HINIC_PMD) += hinic_pmd_niccfg.c
-SRCS-$(CONFIG_RTE_LIBRTE_HINIC_PMD) += hinic_pmd_nicio.c
-SRCS-$(CONFIG_RTE_LIBRTE_HINIC_PMD) += hinic_pmd_wq.c
-SRCS-$(CONFIG_RTE_LIBRTE_HINIC_PMD) += hinic_pmd_mbox.c
-SRCS-$(CONFIG_RTE_LIBRTE_HINIC_PMD) += hinic_pmd_flow.c
-
-SRCS-$(CONFIG_RTE_LIBRTE_HINIC_PMD) += hinic_pmd_ethdev.c
-SRCS-$(CONFIG_RTE_LIBRTE_HINIC_PMD) += hinic_pmd_rx.c
-SRCS-$(CONFIG_RTE_LIBRTE_HINIC_PMD) += hinic_pmd_tx.c
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/net/hns3/Makefile b/drivers/net/hns3/Makefile
deleted file mode 100644
index d7798a4706..0000000000
--- a/drivers/net/hns3/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2018-2019 Hisilicon Limited.
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-#
-# library name
-#
-LIB = librte_pmd_hns3.a
-
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS)
-# Experimantal APIs:
-# - rte_mp_action_register
-# - rte_mp_action_unregister
-# - rte_mp_reply
-# - rte_mp_request_sync
-
-LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring
-LDLIBS += -lrte_ethdev -lrte_net -lrte_hash
-LDLIBS += -lrte_bus_pci
-
-EXPORT_MAP := rte_pmd_hns3_version.map
-
-#
-# all source are stored in SRCS-y
-#
-SRCS-$(CONFIG_RTE_LIBRTE_HNS3_PMD) += hns3_ethdev.c
-SRCS-$(CONFIG_RTE_LIBRTE_HNS3_PMD) += hns3_ethdev_vf.c
-SRCS-$(CONFIG_RTE_LIBRTE_HNS3_PMD) += hns3_cmd.c
-SRCS-$(CONFIG_RTE_LIBRTE_HNS3_PMD) += hns3_mbx.c
-SRCS-$(CONFIG_RTE_LIBRTE_HNS3_PMD) += hns3_rxtx.c
-SRCS-$(CONFIG_RTE_LIBRTE_HNS3_PMD) += hns3_rss.c
-SRCS-$(CONFIG_RTE_LIBRTE_HNS3_PMD) += hns3_flow.c
-SRCS-$(CONFIG_RTE_LIBRTE_HNS3_PMD) += hns3_fdir.c
-SRCS-$(CONFIG_RTE_LIBRTE_HNS3_PMD) += hns3_intr.c
-SRCS-$(CONFIG_RTE_LIBRTE_HNS3_PMD) += hns3_stats.c
-SRCS-$(CONFIG_RTE_LIBRTE_HNS3_PMD) += hns3_regs.c
-SRCS-$(CONFIG_RTE_LIBRTE_HNS3_PMD) += hns3_dcb.c
-SRCS-$(CONFIG_RTE_LIBRTE_HNS3_PMD) += hns3_mp.c
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/net/i40e/Makefile b/drivers/net/i40e/Makefile
deleted file mode 100644
index 43f10941b2..0000000000
--- a/drivers/net/i40e/Makefile
+++ /dev/null
@@ -1,112 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2017 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-#
-# library name
-#
-LIB = librte_pmd_i40e.a
-
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS) -DPF_DRIVER -DVF_DRIVER -DINTEGRATED_VF
-CFLAGS += -DX722_A0_SUPPORT
-
-LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring
-LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -lrte_hash
-LDLIBS += -lrte_bus_pci
-
-EXPORT_MAP := rte_pmd_i40e_version.map
-
-#
-# Add extra flags for base driver files (also known as shared code)
-# to disable warnings
-#
-ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y)
-CFLAGS_BASE_DRIVER = -diag-disable 593
-else ifeq ($(CONFIG_RTE_TOOLCHAIN_CLANG),y)
-CFLAGS_BASE_DRIVER += -Wno-sign-compare
-CFLAGS_BASE_DRIVER += -Wno-unused-value
-CFLAGS_BASE_DRIVER += -Wno-unused-parameter
-CFLAGS_BASE_DRIVER += -Wno-strict-aliasing
-CFLAGS_BASE_DRIVER += -Wno-format
-CFLAGS_BASE_DRIVER += -Wno-pointer-to-int-cast
-CFLAGS_BASE_DRIVER += -Wno-format-nonliteral
-CFLAGS_BASE_DRIVER += -Wno-unused-variable
-else
-CFLAGS_BASE_DRIVER  = -Wno-sign-compare
-CFLAGS_BASE_DRIVER += -Wno-unused-value
-CFLAGS_BASE_DRIVER += -Wno-unused-parameter
-CFLAGS_BASE_DRIVER += -Wno-strict-aliasing
-CFLAGS_BASE_DRIVER += -Wno-format
-CFLAGS_BASE_DRIVER += -Wno-pointer-to-int-cast
-CFLAGS_BASE_DRIVER += -Wno-format-nonliteral
-CFLAGS_BASE_DRIVER += -Wno-format-security
-CFLAGS_BASE_DRIVER += -Wno-unused-variable
-
-ifeq ($(shell test $(GCC_VERSION) -ge 44 && echo 1), 1)
-CFLAGS_BASE_DRIVER += -Wno-unused-but-set-variable
-endif
-
-CFLAGS_i40e_lan_hmc.o += -Wno-error
-endif
-OBJS_BASE_DRIVER=$(sort $(patsubst %.c,%.o,$(notdir $(wildcard $(SRCDIR)/base/*.c))))
-$(foreach obj, $(OBJS_BASE_DRIVER), $(eval CFLAGS_$(obj)+=$(CFLAGS_BASE_DRIVER)))
-
-VPATH += $(SRCDIR)/base
-
-#
-# all source are stored in SRCS-y
-# base driver is based on the package of dpdk-i40e.2016.04.18.12.tar.gz.
-#
-SRCS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += i40e_adminq.c
-SRCS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += i40e_common.c
-SRCS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += i40e_diag.c
-SRCS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += i40e_hmc.c
-SRCS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += i40e_lan_hmc.c
-SRCS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += i40e_nvm.c
-SRCS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += i40e_dcb.c
-
-SRCS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += i40e_ethdev.c
-SRCS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += i40e_rxtx.c
-ifneq ($(filter y,$(CONFIG_RTE_ARCH_ARM) $(CONFIG_RTE_ARCH_ARM64)),)
-SRCS-$(CONFIG_RTE_LIBRTE_I40E_INC_VECTOR) += i40e_rxtx_vec_neon.c
-else ifeq ($(CONFIG_RTE_ARCH_PPC_64),y)
-SRCS-$(CONFIG_RTE_LIBRTE_I40E_INC_VECTOR) += i40e_rxtx_vec_altivec.c
-else
-SRCS-$(CONFIG_RTE_LIBRTE_I40E_INC_VECTOR) += i40e_rxtx_vec_sse.c
-endif
-SRCS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += i40e_ethdev_vf.c
-SRCS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += i40e_pf.c
-SRCS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += i40e_fdir.c
-SRCS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += i40e_flow.c
-SRCS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += rte_pmd_i40e.c
-SRCS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += i40e_tm.c
-SRCS-$(CONFIG_RTE_LIBRTE_I40E_PMD) += i40e_vf_representor.c
-
-ifeq ($(CONFIG_RTE_LIBRTE_I40E_INC_VECTOR),y)
-ifeq ($(findstring RTE_MACHINE_CPUFLAG_AVX2,$(CFLAGS)),RTE_MACHINE_CPUFLAG_AVX2)
-	CC_AVX2_SUPPORT=1
-else
-	CC_AVX2_SUPPORT=\
-	$(shell $(CC) -march=core-avx2 -dM -E - </dev/null 2>&1 | \
-	grep -q AVX2 && echo 1)
-	ifeq ($(CC_AVX2_SUPPORT), 1)
-		ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y)
-			CFLAGS_i40e_rxtx_vec_avx2.o += -march=core-avx2
-		else
-			CFLAGS_i40e_rxtx_vec_avx2.o += -mavx2
-		endif
-	endif
-endif
-endif
-
-ifeq ($(CC_AVX2_SUPPORT), 1)
-	SRCS-$(CONFIG_RTE_LIBRTE_I40E_INC_VECTOR) += i40e_rxtx_vec_avx2.c
-	CFLAGS_i40e_rxtx.o += -DCC_AVX2_SUPPORT
-endif
-
-# install this header file
-SYMLINK-$(CONFIG_RTE_LIBRTE_I40E_PMD)-include := rte_pmd_i40e.h
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/net/iavf/Makefile b/drivers/net/iavf/Makefile
deleted file mode 100644
index 792cbb7f79..0000000000
--- a/drivers/net/iavf/Makefile
+++ /dev/null
@@ -1,54 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2017 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-#
-# library name
-#
-LIB = librte_pmd_iavf.a
-
-CFLAGS += -I$(RTE_SDK)/drivers/common/iavf
-CFLAGS += -O3 $(WERROR_FLAGS) -Wno-strict-aliasing
-LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring
-LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -lrte_hash
-LDLIBS += -lrte_bus_pci
-LDLIBS += -lrte_common_iavf
-
-EXPORT_MAP := rte_pmd_iavf_version.map
-
-#
-# all source are stored in SRCS-y
-#
-SRCS-$(CONFIG_RTE_LIBRTE_IAVF_PMD) += iavf_ethdev.c
-SRCS-$(CONFIG_RTE_LIBRTE_IAVF_PMD) += iavf_vchnl.c
-SRCS-$(CONFIG_RTE_LIBRTE_IAVF_PMD) += iavf_rxtx.c
-SRCS-$(CONFIG_RTE_LIBRTE_IAVF_PMD) += iavf_generic_flow.c
-SRCS-$(CONFIG_RTE_LIBRTE_IAVF_PMD) += iavf_fdir.c
-SRCS-$(CONFIG_RTE_LIBRTE_IAVF_PMD) += iavf_hash.c
-ifeq ($(CONFIG_RTE_ARCH_X86), y)
-SRCS-$(CONFIG_RTE_LIBRTE_IAVF_PMD) += iavf_rxtx_vec_sse.c
-endif
-
-ifeq ($(CONFIG_RTE_LIBRTE_IAVF_PMD), y)
-	ifeq ($(findstring RTE_MACHINE_CPUFLAG_AVX2,$(CFLAGS)),RTE_MACHINE_CPUFLAG_AVX2)
-		CC_AVX2_SUPPORT=1
-	else
-		CC_AVX2_SUPPORT=\
-		$(shell $(CC) -march=core-avx2 -dM -E - </dev/null 2>&1 | \
-		grep -q AVX2 && echo 1)
-		ifeq ($(CC_AVX2_SUPPORT), 1)
-			ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y)
-				CFLAGS_iavf_rxtx_vec_avx2.o += -march=core-avx2
-			else
-				CFLAGS_iavf_rxtx_vec_avx2.o += -mavx2
-			endif
-		endif
-	endif
-endif
-
-ifeq ($(CC_AVX2_SUPPORT), 1)
-	SRCS-$(CONFIG_RTE_LIBRTE_IAVF_PMD) += iavf_rxtx_vec_avx2.c
-endif
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/net/ice/Makefile b/drivers/net/ice/Makefile
deleted file mode 100644
index 34cd4024b3..0000000000
--- a/drivers/net/ice/Makefile
+++ /dev/null
@@ -1,96 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2018 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-#
-# library name
-#
-LIB = librte_pmd_ice.a
-
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS)
-CFLAGS += -I$(RTE_SDK)/drivers/common/iavf
-
-LDLIBS += -lrte_eal -lrte_mbuf -lrte_ethdev -lrte_kvargs
-LDLIBS += -lrte_bus_pci -lrte_mempool -lrte_hash
-LDLIBS += -lrte_net -lrte_common_iavf
-LDLIBS += -lpthread
-
-EXPORT_MAP := rte_pmd_ice_version.map
-
-#
-# Add extra flags for base driver files (also known as shared code)
-# to disable warnings
-#
-ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y)
-CFLAGS_BASE_DRIVER +=
-else ifeq ($(CONFIG_RTE_TOOLCHAIN_CLANG),y)
-CFLAGS_BASE_DRIVER += -Wno-unused-parameter
-CFLAGS_BASE_DRIVER += -Wno-unused-variable
-else
-CFLAGS_BASE_DRIVER += -Wno-unused-parameter
-CFLAGS_BASE_DRIVER += -Wno-unused-variable
-
-ifeq ($(shell test $(GCC_VERSION) -ge 44 && echo 1), 1)
-CFLAGS_BASE_DRIVER += -Wno-unused-but-set-variable
-endif
-
-endif
-OBJS_BASE_DRIVER=$(patsubst %.c,%.o,$(notdir $(wildcard $(SRCDIR)/base/*.c)))
-$(foreach obj, $(OBJS_BASE_DRIVER), $(eval CFLAGS_$(obj)+=$(CFLAGS_BASE_DRIVER)))
-
-VPATH += $(SRCDIR)/base
-
-#
-# all source are stored in SRCS-y
-#
-SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_controlq.c
-SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_common.c
-SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_sched.c
-SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_switch.c
-SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_nvm.c
-SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_flex_pipe.c
-SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_flow.c
-SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_dcb.c
-SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_fdir.c
-SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_acl.c
-SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_acl_ctrl.c
-
-SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_ethdev.c
-SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_rxtx.c
-ifeq ($(CONFIG_RTE_ARCH_X86), y)
-SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_rxtx_vec_sse.c
-endif
-
-SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_switch_filter.c
-SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_fdir_filter.c
-SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_hash.c
-ifeq ($(findstring RTE_MACHINE_CPUFLAG_AVX2,$(CFLAGS)),RTE_MACHINE_CPUFLAG_AVX2)
-	CC_AVX2_SUPPORT=1
-else
-	CC_AVX2_SUPPORT=\
-	$(shell $(CC) -march=core-avx2 -dM -E - </dev/null 2>&1 | \
-	grep -q AVX2 && echo 1)
-	ifeq ($(CC_AVX2_SUPPORT), 1)
-		ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y)
-			CFLAGS_ice_rxtx_vec_avx2.o += -march=core-avx2
-		else
-			CFLAGS_ice_rxtx_vec_avx2.o += -mavx2
-		endif
-	endif
-endif
-
-ifeq ($(CC_AVX2_SUPPORT), 1)
-	SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_rxtx_vec_avx2.c
-endif
-SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_generic_flow.c
-
-SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_dcf.c
-SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_dcf_ethdev.c
-SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_dcf_parent.c
-
-# install this header file
-SYMLINK-$(CONFIG_RTE_LIBRTE_ICE_PMD)-include := rte_pmd_ice.h
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/net/igc/Makefile b/drivers/net/igc/Makefile
deleted file mode 100644
index d6d7959d2d..0000000000
--- a/drivers/net/igc/Makefile
+++ /dev/null
@@ -1,40 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2019-2020 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-#
-# library name
-#
-LIB = librte_pmd_igc.a
-
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS)
-LDLIBS += -lrte_eal
-LDLIBS += -lrte_ethdev
-LDLIBS += -lrte_bus_pci
-LDLIBS += -lrte_mbuf
-LDLIBS += -lrte_mempool
-
-EXPORT_MAP := rte_pmd_igc_version.map
-
-VPATH += $(SRCDIR)/base
-
-#
-# all source are stored in SRCS-y
-#
-SRCS-$(CONFIG_RTE_LIBRTE_IGC_PMD) += igc_api.c
-SRCS-$(CONFIG_RTE_LIBRTE_IGC_PMD) += igc_base.c
-SRCS-$(CONFIG_RTE_LIBRTE_IGC_PMD) += igc_i225.c
-SRCS-$(CONFIG_RTE_LIBRTE_IGC_PMD) += igc_mac.c
-SRCS-$(CONFIG_RTE_LIBRTE_IGC_PMD) += igc_manage.c
-SRCS-$(CONFIG_RTE_LIBRTE_IGC_PMD) += igc_nvm.c
-SRCS-$(CONFIG_RTE_LIBRTE_IGC_PMD) += igc_osdep.c
-SRCS-$(CONFIG_RTE_LIBRTE_IGC_PMD) += igc_phy.c
-SRCS-$(CONFIG_RTE_LIBRTE_IGC_PMD) += igc_logs.c
-SRCS-$(CONFIG_RTE_LIBRTE_IGC_PMD) += igc_ethdev.c
-SRCS-$(CONFIG_RTE_LIBRTE_IGC_PMD) += igc_txrx.c
-SRCS-$(CONFIG_RTE_LIBRTE_IGC_PMD) += igc_filter.c
-SRCS-$(CONFIG_RTE_LIBRTE_IGC_PMD) += igc_flow.c
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/net/ionic/Makefile b/drivers/net/ionic/Makefile
deleted file mode 100644
index 7442e2c5cb..0000000000
--- a/drivers/net/ionic/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@ 
-# SPDX-License-Identifier: (BSD-3-Clause OR GPL-2.0)
-# Copyright(c) 2018-2019 Pensando Systems, Inc. All rights reserved.
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-#
-# library name
-#
-LIB = librte_pmd_ionic.a
-
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS)
-
-EXPORT_MAP := rte_pmd_ionic_version.map
-
-LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring
-LDLIBS += -lrte_ethdev -lrte_net
-LDLIBS += -lrte_bus_pci
-
-#
-# all source are stored in SRCS-y
-#
-SRCS-$(CONFIG_RTE_LIBRTE_IONIC_PMD) += ionic_mac_api.c
-SRCS-$(CONFIG_RTE_LIBRTE_IONIC_PMD) += ionic_rx_filter.c
-SRCS-$(CONFIG_RTE_LIBRTE_IONIC_PMD) += ionic_rxtx.c
-SRCS-$(CONFIG_RTE_LIBRTE_IONIC_PMD) += ionic_dev.c
-SRCS-$(CONFIG_RTE_LIBRTE_IONIC_PMD) += ionic_ethdev.c
-SRCS-$(CONFIG_RTE_LIBRTE_IONIC_PMD) += ionic_lif.c
-SRCS-$(CONFIG_RTE_LIBRTE_IONIC_PMD) += ionic_main.c
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/net/ipn3ke/Makefile b/drivers/net/ipn3ke/Makefile
deleted file mode 100644
index 40696dbde8..0000000000
--- a/drivers/net/ipn3ke/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2019 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-#
-# library name
-#
-LIB = librte_pmd_ipn3ke.a
-
-#
-# Add the experimenatal APIs called from this PMD
-#  rte_eth_switch_domain_alloc()
-#  rte_eth_dev_create()
-#  rte_eth_dev_destroy()
-#  rte_eth_switch_domain_free()
-#
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS)
-CFLAGS += -I$(RTE_SDK)/drivers/bus/ifpga
-CFLAGS += -I$(RTE_SDK)/drivers/raw/ifpga
-LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring
-LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs
-LDLIBS += -lrte_bus_ifpga
-LDLIBS += -lrte_bus_vdev
-LDLIBS += -lpthread
-
-EXPORT_MAP := rte_pmd_ipn3ke_version.map
-
-#
-# all source are stored in SRCS-y
-#
-SRCS-$(CONFIG_RTE_LIBRTE_IPN3KE_PMD) += ipn3ke_ethdev.c
-SRCS-$(CONFIG_RTE_LIBRTE_IPN3KE_PMD) += ipn3ke_representor.c
-SRCS-$(CONFIG_RTE_LIBRTE_IPN3KE_PMD) += ipn3ke_tm.c
-SRCS-$(CONFIG_RTE_LIBRTE_IPN3KE_PMD) += ipn3ke_flow.c
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/net/ixgbe/Makefile b/drivers/net/ixgbe/Makefile
deleted file mode 100644
index aebf3b286c..0000000000
--- a/drivers/net/ixgbe/Makefile
+++ /dev/null
@@ -1,110 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2016 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-#
-# library name
-#
-LIB = librte_pmd_ixgbe.a
-
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS)
-
-EXPORT_MAP := rte_pmd_ixgbe_version.map
-
-ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y)
-#
-# CFLAGS for icc
-#
-CFLAGS_BASE_DRIVER  = -diag-disable 174 -diag-disable 593 -diag-disable 869
-CFLAGS_BASE_DRIVER += -diag-disable 981 -diag-disable 2259
-
-CFLAGS_ixgbe_rxtx.o += -diag-disable 3656
-
-else ifeq ($(CONFIG_RTE_TOOLCHAIN_CLANG),y)
-#
-# CFLAGS for clang
-#
-CFLAGS_BASE_DRIVER = -Wno-unused-parameter -Wno-unused-value
-CFLAGS_BASE_DRIVER += -Wno-strict-aliasing -Wno-format-extra-args
-
-else
-#
-# CFLAGS for gcc
-#
-ifeq ($(shell test $(GCC_VERSION) -ge 44 && echo 1), 1)
-CFLAGS     += -Wno-deprecated
-CFLAGS_ixgbe_common.o += -Wno-unused-but-set-variable
-CFLAGS_ixgbe_x550.o += -Wno-unused-but-set-variable
-endif
-CFLAGS_BASE_DRIVER = -Wno-unused-parameter -Wno-unused-value
-CFLAGS_BASE_DRIVER += -Wno-strict-aliasing -Wno-format-extra-args
-
-ifeq ($(shell test $(GCC_VERSION) -ge 46 && echo 1), 1)
-CFLAGS_ixgbe_x550.o += -Wno-maybe-uninitialized
-endif
-
-ifeq ($(shell test $(GCC_VERSION) -ge 50 && echo 1), 1)
-CFLAGS_ixgbe_common.o += -Wno-logical-not-parentheses
-ifeq ($(shell test $(GCC_VERSION) -ge 70 && echo 1), 1)
-CFLAGS_BASE_DRIVER += -Wno-implicit-fallthrough
-endif
-endif
-
-endif
-LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring
-LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -lrte_hash
-LDLIBS += -lrte_bus_pci
-LDLIBS += -lpthread
-
-#
-# Add extra flags for base driver files (also known as shared code)
-# to disable warnings in them
-#
-BASE_DRIVER_OBJS=$(sort $(patsubst %.c,%.o,$(notdir $(wildcard $(SRCDIR)/base/*.c))))
-$(foreach obj, $(BASE_DRIVER_OBJS), $(eval CFLAGS_$(obj)+=$(CFLAGS_BASE_DRIVER)))
-
-VPATH += $(SRCDIR)/base
-
-#
-# all source are stored in SRCS-y
-#
-SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_common.c
-SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_82598.c
-SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_82599.c
-SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_x540.c
-SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_x550.c
-SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_phy.c
-SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_api.c
-SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_vf.c
-SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_hv_vf.c
-SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_dcb.c
-SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_dcb_82599.c
-SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_dcb_82598.c
-SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_mbx.c
-SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_rxtx.c
-SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_ethdev.c
-SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_fdir.c
-SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_pf.c
-SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_flow.c
-ifneq ($(filter y,$(CONFIG_RTE_ARCH_ARM) $(CONFIG_RTE_ARCH_ARM64)),)
-SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_rxtx_vec_neon.c
-else ifeq ($(CONFIG_RTE_ARCH_X86),y)
-SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_rxtx_vec_sse.c
-endif
-ifeq ($(CONFIG_RTE_LIBRTE_IXGBE_BYPASS),y)
-SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_bypass.c
-SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_82599_bypass.c
-endif
-ifeq ($(CONFIG_RTE_LIBRTE_SECURITY),y)
-SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_ipsec.c
-endif
-SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += rte_pmd_ixgbe.c
-SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_tm.c
-SRCS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD) += ixgbe_vf_representor.c
-
-# install this header file
-SYMLINK-$(CONFIG_RTE_LIBRTE_IXGBE_PMD)-include := rte_pmd_ixgbe.h
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/net/kni/Makefile b/drivers/net/kni/Makefile
deleted file mode 100644
index 0694ffd021..0000000000
--- a/drivers/net/kni/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2017 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-#
-# library name
-#
-LIB = librte_pmd_kni.a
-
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS)
-LDLIBS += -lpthread
-LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring
-LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -lrte_kni
-LDLIBS += -lrte_bus_vdev
-
-EXPORT_MAP := rte_pmd_kni_version.map
-
-#
-# all source are stored in SRCS-y
-#
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_KNI) += rte_eth_kni.c
-
-#
-# Export include files
-#
-SYMLINK-y-include +=
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/net/liquidio/Makefile b/drivers/net/liquidio/Makefile
deleted file mode 100644
index d7fda7f527..0000000000
--- a/drivers/net/liquidio/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2017 Cavium, Inc
-#
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-#
-# library name
-#
-LIB = librte_pmd_lio.a
-
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR)/base -I$(SRCDIR)
-LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring
-LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs
-LDLIBS += -lrte_bus_pci
-
-EXPORT_MAP := rte_pmd_liquidio_version.map
-
-VPATH += $(RTE_SDK)/drivers/net/liquidio/base
-
-#
-# all source are stored in SRCS-y
-#
-SRCS-$(CONFIG_RTE_LIBRTE_LIO_PMD) += lio_ethdev.c
-SRCS-$(CONFIG_RTE_LIBRTE_LIO_PMD) += lio_rxtx.c
-SRCS-$(CONFIG_RTE_LIBRTE_LIO_PMD) += lio_23xx_vf.c
-SRCS-$(CONFIG_RTE_LIBRTE_LIO_PMD) += lio_mbox.c
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/net/memif/Makefile b/drivers/net/memif/Makefile
deleted file mode 100644
index 3bf4ddce4c..0000000000
--- a/drivers/net/memif/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2018-2019 Cisco Systems, Inc.  All rights reserved.
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-#
-# library name
-#
-LIB = librte_pmd_memif.a
-
-EXPORT_MAP := rte_pmd_memif_version.map
-
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS)
-LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool
-LDLIBS += -lrte_ethdev -lrte_kvargs -lrte_net
-LDLIBS += -lrte_hash
-LDLIBS += -lrte_bus_vdev
-
-#
-# all source are stored in SRCS-y
-#
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_MEMIF) += rte_eth_memif.c
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_MEMIF) += memif_socket.c
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/net/mlx4/Makefile b/drivers/net/mlx4/Makefile
deleted file mode 100644
index 02e9b2ec07..0000000000
--- a/drivers/net/mlx4/Makefile
+++ /dev/null
@@ -1,142 +0,0 @@ 
-#   SPDX-License-Identifier: BSD-3-Clause
-#   Copyright 2012 6WIND S.A.
-#   Copyright 2012 Mellanox Technologies, Ltd
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-# Library name.
-LIB = librte_pmd_mlx4.a
-LIB_GLUE = $(LIB_GLUE_BASE).$(LIB_GLUE_VERSION)
-LIB_GLUE_BASE = librte_pmd_mlx4_glue.so
-LIB_GLUE_VERSION = 18.02.0
-
-# Sources.
-SRCS-$(CONFIG_RTE_LIBRTE_MLX4_PMD) += mlx4.c
-SRCS-$(CONFIG_RTE_LIBRTE_MLX4_PMD) += mlx4_ethdev.c
-SRCS-$(CONFIG_RTE_LIBRTE_MLX4_PMD) += mlx4_flow.c
-ifneq ($(CONFIG_RTE_IBVERBS_LINK_DLOPEN),y)
-SRCS-$(CONFIG_RTE_LIBRTE_MLX4_PMD) += mlx4_glue.c
-endif
-SRCS-$(CONFIG_RTE_LIBRTE_MLX4_PMD) += mlx4_intr.c
-SRCS-$(CONFIG_RTE_LIBRTE_MLX4_PMD) += mlx4_mp.c
-SRCS-$(CONFIG_RTE_LIBRTE_MLX4_PMD) += mlx4_mr.c
-SRCS-$(CONFIG_RTE_LIBRTE_MLX4_PMD) += mlx4_rxq.c
-SRCS-$(CONFIG_RTE_LIBRTE_MLX4_PMD) += mlx4_rxtx.c
-SRCS-$(CONFIG_RTE_LIBRTE_MLX4_PMD) += mlx4_txq.c
-SRCS-$(CONFIG_RTE_LIBRTE_MLX4_PMD) += mlx4_utils.c
-
-ifeq ($(CONFIG_RTE_IBVERBS_LINK_DLOPEN),y)
-INSTALL-$(CONFIG_RTE_LIBRTE_MLX4_PMD)-lib += $(LIB_GLUE)
-endif
-
-# Basic CFLAGS.
-CFLAGS += -O3
-CFLAGS += -std=c11 -Wall -Wextra
-CFLAGS += -g
-CFLAGS += -I.
-CFLAGS += -D_BSD_SOURCE
-CFLAGS += -D_DEFAULT_SOURCE
-CFLAGS += -D_XOPEN_SOURCE=600
-CFLAGS += $(WERROR_FLAGS)
-ifeq ($(CONFIG_RTE_IBVERBS_LINK_DLOPEN),y)
-CFLAGS += -DMLX4_GLUE='"$(LIB_GLUE)"'
-CFLAGS += -DMLX4_GLUE_VERSION='"$(LIB_GLUE_VERSION)"'
-CFLAGS_mlx4_glue.o += -fPIC
-LDLIBS += -ldl
-else ifeq ($(CONFIG_RTE_IBVERBS_LINK_STATIC),y)
-LDLIBS += $(shell $(RTE_SDK)/buildtools/options-ibverbs-static.sh)
-else
-LDLIBS += -libverbs -lmlx4
-endif
-LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring
-LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs
-LDLIBS += -lrte_bus_pci
-
-# A few warnings cannot be avoided in external headers.
-CFLAGS += -Wno-error=cast-qual
-
-EXPORT_MAP := rte_pmd_mlx4_version.map
-# DEBUG which is usually provided on the command-line may enable
-# CONFIG_RTE_LIBRTE_MLX4_DEBUG.
-ifeq ($(DEBUG),1)
-CONFIG_RTE_LIBRTE_MLX4_DEBUG := y
-endif
-
-# User-defined CFLAGS.
-ifeq ($(CONFIG_RTE_LIBRTE_MLX4_DEBUG),y)
-CFLAGS += -pedantic
-ifneq ($(CONFIG_RTE_TOOLCHAIN_ICC),y)
-CFLAGS += -DPEDANTIC
-endif
-AUTO_CONFIG_CFLAGS += -Wno-pedantic
-else
-CFLAGS += -UPEDANTIC
-endif
-
-include $(RTE_SDK)/mk/rte.lib.mk
-
-# Generate and clean-up mlx4_autoconf.h.
-
-export CC CFLAGS CPPFLAGS EXTRA_CFLAGS EXTRA_CPPFLAGS
-export AUTO_CONFIG_CFLAGS += -Wno-error
-
-ifndef V
-AUTOCONF_OUTPUT := >/dev/null
-endif
-
-mlx4_autoconf.h.new: FORCE
-
-mlx4_autoconf.h.new: $(RTE_SDK)/buildtools/auto-config-h.sh
-	$Q $(RM) -f -- '$@'
-	$Q : > '$@'
-	$Q sh -- '$<' '$@' \
-		HAVE_IBV_MLX4_BUF_ALLOCATORS \
-		infiniband/mlx4dv.h \
-		enum MLX4DV_SET_CTX_ATTR_BUF_ALLOCATORS \
-		$(AUTOCONF_OUTPUT)
-	$Q sh -- '$<' '$@' \
-		HAVE_IBV_MLX4_UAR_MMAP_OFFSET \
-		infiniband/mlx4dv.h \
-		enum MLX4DV_QP_MASK_UAR_MMAP_OFFSET \
-		$(AUTOCONF_OUTPUT)
-	$Q sh -- '$<' '$@' \
-		HAVE_IBV_MLX4_WQE_LSO_SEG \
-		infiniband/mlx4dv.h \
-		type 'struct mlx4_wqe_lso_seg' \
-		$(AUTOCONF_OUTPUT)
-
-# Create mlx4_autoconf.h or update it in case it differs from the new one.
-
-mlx4_autoconf.h: mlx4_autoconf.h.new
-	$Q [ -f '$@' ] && \
-		cmp '$<' '$@' $(AUTOCONF_OUTPUT) || \
-		mv '$<' '$@'
-
-$(SRCS-$(CONFIG_RTE_LIBRTE_MLX4_PMD):.c=.o): mlx4_autoconf.h
-
-# Generate dependency plug-in for rdma-core when the PMD must not be linked
-# directly, so that applications do not inherit this dependency.
-
-ifeq ($(CONFIG_RTE_IBVERBS_LINK_DLOPEN),y)
-
-$(LIB): $(LIB_GLUE)
-
-ifeq ($(LINK_USING_CC),1)
-GLUE_LDFLAGS := $(call linkerprefix,$(LDFLAGS))
-else
-GLUE_LDFLAGS := $(LDFLAGS)
-endif
-$(LIB_GLUE): mlx4_glue.o
-	$Q $(LD) $(GLUE_LDFLAGS) $(EXTRA_LDFLAGS) \
-		-Wl,-h,$(LIB_GLUE) \
-		-shared -o $@ $< -libverbs -lmlx4
-
-mlx4_glue.o: mlx4_autoconf.h
-
-endif
-
-clean_mlx4: FORCE
-	$Q rm -f -- mlx4_autoconf.h mlx4_autoconf.h.new
-	$Q rm -f -- mlx4_glue.o $(LIB_GLUE_BASE)*
-
-clean: clean_mlx4
diff --git a/drivers/net/mlx5/Makefile b/drivers/net/mlx5/Makefile
deleted file mode 100644
index 568c772415..0000000000
--- a/drivers/net/mlx5/Makefile
+++ /dev/null
@@ -1,82 +0,0 @@ 
-#   SPDX-License-Identifier: BSD-3-Clause
-#   Copyright 2015 6WIND S.A.
-#   Copyright 2015 Mellanox Technologies, Ltd
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-# Library name.
-LIB = librte_pmd_mlx5.a
-
-# Sources.
-SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5.c
-SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_rxq.c
-SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_txq.c
-SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_txpp.c
-SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_rxtx.c
-ifneq ($(filter y,$(CONFIG_RTE_ARCH_X86_64) \
-			$(CONFIG_RTE_ARCH_PPC_64) \
-		  $(CONFIG_RTE_ARCH_ARM64)),)
-SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_rxtx_vec.c
-endif
-SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_trigger.c
-SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_ethdev.c
-SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_mac.c
-SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_rxmode.c
-SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_vlan.c
-SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_stats.c
-SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_rss.c
-SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_mr.c
-SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_flow.c
-SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_flow_meter.c
-SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_flow_dv.c
-SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_flow_verbs.c
-SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += mlx5_utils.c
-SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += linux/mlx5_socket.c
-SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += linux/mlx5_os.c
-SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += linux/mlx5_ethdev_os.c
-SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += linux/mlx5_verbs.c
-SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) += linux/mlx5_mp_os.c
-
-# Basic CFLAGS.
-CFLAGS += -O3
-CFLAGS += -std=c11 -Wall -Wextra
-CFLAGS += -g
-CFLAGS += -I$(RTE_SDK)/drivers/common/mlx5
-CFLAGS += -I$(RTE_SDK)/drivers/common/mlx5/linux
-CFLAGS += -I$(RTE_SDK)/drivers/net/mlx5
-CFLAGS += -I$(RTE_SDK)/drivers/net/mlx5/linux
-CFLAGS += -I$(BUILDDIR)/drivers/common/mlx5
-CFLAGS += -D_BSD_SOURCE
-CFLAGS += -D_DEFAULT_SOURCE
-CFLAGS += -D_XOPEN_SOURCE=600
-CFLAGS += $(WERROR_FLAGS)
-CFLAGS += -Wno-strict-prototypes
-LDLIBS += -lrte_common_mlx5
-LDLIBS += -lm
-LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring
-LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs
-
-# A few warnings cannot be avoided in external headers.
-CFLAGS += -Wno-error=cast-qual
-
-EXPORT_MAP := rte_pmd_mlx5_version.map
-
-# DEBUG which is usually provided on the command-line may enable
-# CONFIG_RTE_LIBRTE_MLX5_DEBUG.
-ifeq ($(DEBUG),1)
-CONFIG_RTE_LIBRTE_MLX5_DEBUG := y
-endif
-
-# User-defined CFLAGS.
-ifeq ($(CONFIG_RTE_LIBRTE_MLX5_DEBUG),y)
-CFLAGS += -pedantic
-ifneq ($(CONFIG_RTE_TOOLCHAIN_ICC),y)
-CFLAGS += -DPEDANTIC
-endif
-AUTO_CONFIG_CFLAGS += -Wno-pedantic
-else
-CFLAGS += -UPEDANTIC
-endif
-
-include $(RTE_SDK)/mk/rte.lib.mk
-
diff --git a/drivers/net/mvneta/Makefile b/drivers/net/mvneta/Makefile
deleted file mode 100644
index 41e50479ff..0000000000
--- a/drivers/net/mvneta/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2018 Marvell International Ltd.
-# Copyright(c) 2018 Semihalf.
-# All rights reserved.
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-ifneq ($(MAKECMDGOALS),clean)
-ifneq ($(MAKECMDGOALS),config)
-ifeq ($(LIBMUSDK_PATH),)
-$(error "Please define LIBMUSDK_PATH environment variable")
-endif
-endif
-endif
-
-# library name
-LIB = librte_pmd_mvneta.a
-
-# versioning export map
-EXPORT_MAP := rte_pmd_mvneta_version.map
-
-# external library dependencies
-CFLAGS += -I$(RTE_SDK)/drivers/common/mvep
-CFLAGS += -I$(LIBMUSDK_PATH)/include
-CFLAGS += -DMVCONF_TYPES_PUBLIC
-CFLAGS += -DMVCONF_DMA_PHYS_ADDR_T_PUBLIC
-CFLAGS += -DMVCONF_DMA_PHYS_ADDR_T_SIZE=64
-CFLAGS += $(WERROR_FLAGS)
-CFLAGS += -O3
-LDLIBS += -L$(LIBMUSDK_PATH)/lib
-LDLIBS += -lmusdk
-LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring
-LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -lrte_cfgfile
-LDLIBS += -lrte_bus_vdev -lrte_common_mvep
-
-# library source files
-SRCS-$(CONFIG_RTE_LIBRTE_MVNETA_PMD) += mvneta_ethdev.c mvneta_rxtx.c
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/net/mvpp2/Makefile b/drivers/net/mvpp2/Makefile
deleted file mode 100644
index 8a3ec93a60..0000000000
--- a/drivers/net/mvpp2/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2017 Marvell International Ltd.
-# Copyright(c) 2017 Semihalf.
-# All rights reserved.
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-ifneq ($(MAKECMDGOALS),clean)
-ifneq ($(MAKECMDGOALS),config)
-ifeq ($(LIBMUSDK_PATH),)
-$(error "Please define LIBMUSDK_PATH environment variable")
-endif
-endif
-endif
-
-# library name
-LIB = librte_pmd_mvpp2.a
-
-# versioning export map
-EXPORT_MAP := rte_pmd_mvpp2_version.map
-
-# external library dependencies
-CFLAGS += -I$(RTE_SDK)/drivers/common/mvep
-CFLAGS += -I$(LIBMUSDK_PATH)/include
-CFLAGS += -DMVCONF_TYPES_PUBLIC
-CFLAGS += -DMVCONF_DMA_PHYS_ADDR_T_PUBLIC
-CFLAGS += $(WERROR_FLAGS)
-CFLAGS += -O3
-LDLIBS += -L$(LIBMUSDK_PATH)/lib
-LDLIBS += -lmusdk
-LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring
-LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -lrte_cfgfile
-LDLIBS += -lrte_bus_vdev -lrte_common_mvep
-
-# library source files
-SRCS-$(CONFIG_RTE_LIBRTE_MVPP2_PMD) += mrvl_ethdev.c
-SRCS-$(CONFIG_RTE_LIBRTE_MVPP2_PMD) += mrvl_qos.c
-SRCS-$(CONFIG_RTE_LIBRTE_MVPP2_PMD) += mrvl_flow.c
-SRCS-$(CONFIG_RTE_LIBRTE_MVPP2_PMD) += mrvl_mtr.c
-SRCS-$(CONFIG_RTE_LIBRTE_MVPP2_PMD) += mrvl_tm.c
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/net/netvsc/Makefile b/drivers/net/netvsc/Makefile
deleted file mode 100644
index da8991584a..0000000000
--- a/drivers/net/netvsc/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-LIB = librte_pmd_netvsc.a
-
-CFLAGS += -O3 $(WERROR_FLAGS)
-
-EXPORT_MAP := rte_pmd_netvsc_version.map
-
-SRCS-$(CONFIG_RTE_LIBRTE_NETVSC_PMD) += hn_ethdev.c
-SRCS-$(CONFIG_RTE_LIBRTE_NETVSC_PMD) += hn_rxtx.c
-SRCS-$(CONFIG_RTE_LIBRTE_NETVSC_PMD) += hn_rndis.c
-SRCS-$(CONFIG_RTE_LIBRTE_NETVSC_PMD) += hn_nvs.c
-SRCS-$(CONFIG_RTE_LIBRTE_NETVSC_PMD) += hn_vf.c
-
-LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring
-LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs
-LDLIBS += -lrte_bus_vmbus
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/net/nfb/Makefile b/drivers/net/nfb/Makefile
deleted file mode 100644
index e92d29dcd3..0000000000
--- a/drivers/net/nfb/Makefile
+++ /dev/null
@@ -1,40 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2019 Cesnet
-# Copyright(c) 2019 Netcope Technologies, a.s. <info@netcope.com>
-# All rights reserved.
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-#
-# library name
-#
-LIB = librte_pmd_nfb.a
-
-INCLUDES :=-I$(SRCDIR)
-
-
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS)
-CFLAGS += $(shell command -v pkg-config > /dev/null 2>&1 && pkg-config --cflags netcope-common)
-LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_kvargs
-LDLIBS += -lrte_ethdev -lrte_net
-LDLIBS += -lrte_bus_pci
-LDLIBS += $(shell command -v pkg-config > /dev/null 2>&1 && pkg-config --libs netcope-common)
-
-EXPORT_MAP := rte_pmd_nfb_version.map
-
-#
-# all source are stored in SRCS-y
-#
-SRCS-$(CONFIG_RTE_LIBRTE_NFB_PMD) += nfb_ethdev.c
-SRCS-$(CONFIG_RTE_LIBRTE_NFB_PMD) += nfb_rx.c
-SRCS-$(CONFIG_RTE_LIBRTE_NFB_PMD) += nfb_tx.c
-SRCS-$(CONFIG_RTE_LIBRTE_NFB_PMD) += nfb_stats.c
-SRCS-$(CONFIG_RTE_LIBRTE_NFB_PMD) += nfb_rxmode.c
-
-#
-# Export include files
-#
-SYMLINK-y-include +=
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/net/nfp/Makefile b/drivers/net/nfp/Makefile
deleted file mode 100644
index 289b3a60e3..0000000000
--- a/drivers/net/nfp/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-#
-# library name
-#
-LIB = librte_pmd_nfp.a
-
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS)
-
-LDLIBS += -lm
-LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring
-LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs
-LDLIBS += -lrte_bus_pci
-
-EXPORT_MAP := rte_pmd_nfp_version.map
-
-VPATH += $(SRCDIR)/nfpcore
-
-SRCS-$(CONFIG_RTE_LIBRTE_NFP_PMD) += nfp_cppcore.c
-SRCS-$(CONFIG_RTE_LIBRTE_NFP_PMD) += nfp_cpp_pcie_ops.c
-SRCS-$(CONFIG_RTE_LIBRTE_NFP_PMD) += nfp_mutex.c
-SRCS-$(CONFIG_RTE_LIBRTE_NFP_PMD) += nfp_resource.c
-SRCS-$(CONFIG_RTE_LIBRTE_NFP_PMD) += nfp_crc.c
-SRCS-$(CONFIG_RTE_LIBRTE_NFP_PMD) += nfp_mip.c
-SRCS-$(CONFIG_RTE_LIBRTE_NFP_PMD) += nfp_nffw.c
-SRCS-$(CONFIG_RTE_LIBRTE_NFP_PMD) += nfp_hwinfo.c
-SRCS-$(CONFIG_RTE_LIBRTE_NFP_PMD) += nfp_rtsym.c
-SRCS-$(CONFIG_RTE_LIBRTE_NFP_PMD) += nfp_nsp.c
-SRCS-$(CONFIG_RTE_LIBRTE_NFP_PMD) += nfp_nsp_cmds.c
-SRCS-$(CONFIG_RTE_LIBRTE_NFP_PMD) += nfp_nsp_eth.c
-
-#
-# all source are stored in SRCS-y
-#
-SRCS-$(CONFIG_RTE_LIBRTE_NFP_PMD) += nfp_net.c
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/net/null/Makefile b/drivers/net/null/Makefile
deleted file mode 100644
index f51150c131..0000000000
--- a/drivers/net/null/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2015 IGEL Co.,Ltd.
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-#
-# library name
-#
-LIB = librte_pmd_null.a
-
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS)
-LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring
-LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs
-LDLIBS += -lrte_bus_vdev
-
-EXPORT_MAP := rte_pmd_null_version.map
-
-#
-# all source are stored in SRCS-y
-#
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_NULL) += rte_eth_null.c
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/net/octeontx/Makefile b/drivers/net/octeontx/Makefile
deleted file mode 100644
index c4db878009..0000000000
--- a/drivers/net/octeontx/Makefile
+++ /dev/null
@@ -1,53 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2017 Cavium, Inc
-#
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-#
-# library name
-#
-LIB = librte_pmd_octeontx.a
-
-CFLAGS += $(WERROR_FLAGS)
-CFLAGS += -I$(RTE_SDK)/drivers/common/octeontx/
-CFLAGS += -I$(RTE_SDK)/drivers/mempool/octeontx/
-
-EXPORT_MAP := rte_pmd_octeontx_version.map
-
-OBJS_BASE_DRIVER=$(patsubst %.c,%.o,$(notdir $(wildcard $(SRCDIR)/base/*.c)))
-$(foreach obj, $(OBJS_BASE_DRIVER), $(eval CFLAGS_$(obj)+=$(CFLAGS_BASE_DRIVER)))
-
-VPATH += $(SRCDIR)/base
-
-#
-# all source are stored in SRCS-y
-#
-SRCS-$(CONFIG_RTE_LIBRTE_OCTEONTX_PMD) += octeontx_rxtx.c
-SRCS-$(CONFIG_RTE_LIBRTE_OCTEONTX_PMD) += octeontx_pkovf.c
-SRCS-$(CONFIG_RTE_LIBRTE_OCTEONTX_PMD) += octeontx_pkivf.c
-SRCS-$(CONFIG_RTE_LIBRTE_OCTEONTX_PMD) += octeontx_bgx.c
-SRCS-$(CONFIG_RTE_LIBRTE_OCTEONTX_PMD) += octeontx_ethdev.c
-SRCS-$(CONFIG_RTE_LIBRTE_OCTEONTX_PMD) += octeontx_ethdev_ops.c
-
-ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y)
-CFLAGS_octeontx_rxtx.o += -fno-prefetch-loop-arrays
-
-ifeq ($(shell test $(GCC_VERSION) -ge 46 && echo 1), 1)
-CFLAGS_octeontx_rxtx.o += -O3 -Ofast
-else
-CFLAGS_octeontx_rxtx.o += -O3 -ffast-math
-endif
-
-else
-CFLAGS_octeontx_rxtx.o += -O3 -Ofast
-endif
-
-LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring
-LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -lrte_common_octeontx
-LDLIBS += -lrte_mempool_octeontx
-LDLIBS += -lrte_eventdev
-LDLIBS += -lrte_bus_pci
-LDLIBS += -lrte_bus_vdev
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/net/octeontx2/Makefile b/drivers/net/octeontx2/Makefile
deleted file mode 100644
index 0de43e36af..0000000000
--- a/drivers/net/octeontx2/Makefile
+++ /dev/null
@@ -1,63 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(C) 2019 Marvell International Ltd.
-#
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-#
-# library name
-#
-LIB = librte_pmd_octeontx2.a
-
-CFLAGS += $(WERROR_FLAGS)
-CFLAGS += -I$(RTE_SDK)/drivers/common/cpt
-CFLAGS += -I$(RTE_SDK)/drivers/common/octeontx2
-CFLAGS += -I$(RTE_SDK)/drivers/crypto/octeontx2
-CFLAGS += -I$(RTE_SDK)/drivers/mempool/octeontx2
-CFLAGS += -I$(RTE_SDK)/drivers/net/octeontx2
-CFLAGS += -O3
-ifneq ($(CONFIG_RTE_TOOLCHAIN_ICC),y)
-CFLAGS += -flax-vector-conversions
-endif
-
-ifneq ($(CONFIG_RTE_ARCH_64),y)
-CFLAGS += -Wno-int-to-pointer-cast
-CFLAGS += -Wno-pointer-to-int-cast
-ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y)
-CFLAGS += -diag-disable 2259
-endif
-endif
-
-EXPORT_MAP := rte_pmd_octeontx2_version.map
-
-#
-# all source are stored in SRCS-y
-#
-SRCS-$(CONFIG_RTE_LIBRTE_OCTEONTX2_PMD) += \
-	otx2_rx.c 	\
-	otx2_tx.c 	\
-	otx2_tm.c	\
-	otx2_rss.c	\
-	otx2_mac.c	\
-	otx2_ptp.c	\
-	otx2_flow.c	\
-	otx2_link.c	\
-	otx2_vlan.c	\
-	otx2_stats.c	\
-	otx2_mcast.c	\
-	otx2_lookup.c	\
-	otx2_ethdev.c	\
-	otx2_flow_ctrl.c \
-	otx2_flow_parse.c \
-	otx2_flow_utils.c \
-	otx2_ethdev_irq.c \
-	otx2_ethdev_ops.c \
-	otx2_ethdev_sec.c \
-	otx2_ethdev_debug.c \
-	otx2_ethdev_devargs.c
-
-LDLIBS += -lrte_common_octeontx2 -lrte_mempool_octeontx2 -lrte_eal -lrte_net
-LDLIBS += -lrte_ethdev -lrte_bus_pci -lrte_kvargs -lrte_mbuf  -lrte_mempool -lm
-LDLIBS += -lrte_cryptodev -lrte_eventdev -lrte_security
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/net/pcap/Makefile b/drivers/net/pcap/Makefile
deleted file mode 100644
index f243d1a0fa..0000000000
--- a/drivers/net/pcap/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation.
-# Copyright(c) 2014 6WIND S.A.
-# All rights reserved.
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-#
-# library name
-#
-LIB = librte_pmd_pcap.a
-
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS)
-LDLIBS += -lpcap
-LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring
-LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs
-LDLIBS += -lrte_bus_vdev
-
-EXPORT_MAP := rte_pmd_pcap_version.map
-
-#
-# all source are stored in SRCS-y
-#
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_PCAP) += rte_eth_pcap.c
-
-#
-# Export include files
-#
-SYMLINK-y-include +=
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/net/pfe/Makefile b/drivers/net/pfe/Makefile
deleted file mode 100644
index 75d30b01aa..0000000000
--- a/drivers/net/pfe/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2018-2019 NXP
-#
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-#
-# library name
-#
-LIB = librte_pmd_pfe.a
-
-CFLAGS += -O3 $(WERROR_FLAGS)
-CFLAGS += -Wno-pointer-arith
-CFLAGS += -I$(RTE_SDK)/drivers/net/pfe/base/
-CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax
-
-EXPORT_MAP := rte_pmd_pfe_version.map
-
-# Interfaces with DPDK
-SRCS-$(CONFIG_RTE_LIBRTE_PFE_PMD) += pfe_ethdev.c
-SRCS-$(CONFIG_RTE_LIBRTE_PFE_PMD) += pfe_hal.c
-SRCS-$(CONFIG_RTE_LIBRTE_PFE_PMD) += pfe_hif_lib.c
-SRCS-$(CONFIG_RTE_LIBRTE_PFE_PMD) += pfe_hif.c
-
-LDLIBS += -lrte_bus_vdev
-LDLIBS += -lrte_bus_dpaa
-LDLIBS += -lrte_common_dpaax
-LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool
-LDLIBS += -lrte_ethdev -lrte_kvargs
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/net/qede/Makefile b/drivers/net/qede/Makefile
deleted file mode 100644
index 0e8a67b0da..0000000000
--- a/drivers/net/qede/Makefile
+++ /dev/null
@@ -1,109 +0,0 @@ 
-#    SPDX-License-Identifier: BSD-3-Clause
-#    Copyright (c) 2016 - 2018 Cavium Inc.
-#    All rights reserved.
-#    www.cavium.com
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-#
-# library name
-#
-LIB = librte_pmd_qede.a
-
-CFLAGS += -O3
-LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring
-LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs
-LDLIBS += -lrte_bus_pci
-
-EXPORT_MAP := rte_pmd_qede_version.map
-
-#
-# OS
-#
-OS_TYPE := $(shell uname -s)
-
-#
-# CFLAGS
-#
-CFLAGS_BASE_DRIVER = -Wno-unused-parameter
-CFLAGS_BASE_DRIVER += -Wno-sign-compare
-CFLAGS_BASE_DRIVER += -Wno-missing-prototypes
-CFLAGS_BASE_DRIVER += -Wno-cast-qual
-CFLAGS_BASE_DRIVER += -Wno-unused-function
-CFLAGS_BASE_DRIVER += -Wno-unused-variable
-CFLAGS_BASE_DRIVER += -Wno-strict-aliasing
-CFLAGS_BASE_DRIVER += -Wno-missing-prototypes
-
-ifneq ($(CONFIG_RTE_TOOLCHAIN_ICC),y)
-CFLAGS_BASE_DRIVER += -Wno-unused-value
-ifeq ($(OS_TYPE),Linux)
-ifeq ($(shell clang -Wno-shift-negative-value -Werror -E - < /dev/null > /dev/null 2>&1; echo $$?),0)
-CFLAGS_BASE_DRIVER += -Wno-shift-negative-value
-endif
-endif
-endif
-
-ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y)
-ifeq ($(shell test $(GCC_VERSION) -ge 44 && echo 1), 1)
-CFLAGS_BASE_DRIVER += -Wno-unused-but-set-variable
-CFLAGS += -Wno-format-nonliteral
-endif
-CFLAGS_BASE_DRIVER += -Wno-missing-declarations
-ifeq ($(shell test $(GCC_VERSION) -ge 46 && echo 1), 1)
-CFLAGS_BASE_DRIVER += -Wno-maybe-uninitialized
-endif
-CFLAGS_BASE_DRIVER += -Wno-strict-prototypes
-ifeq ($(shell test $(GCC_VERSION) -ge 60 && echo 1), 1)
-CFLAGS_BASE_DRIVER += -Wno-shift-negative-value
-ifeq ($(shell test $(GCC_VERSION) -ge 70 && echo 1), 1)
-CFLAGS_BASE_DRIVER += -Wno-implicit-fallthrough
-endif
-endif
-else ifeq ($(CONFIG_RTE_TOOLCHAIN_CLANG),y)
-CFLAGS_BASE_DRIVER += -Wno-format-extra-args
-CFLAGS_BASE_DRIVER += -Wno-visibility
-CFLAGS_BASE_DRIVER += -Wno-empty-body
-CFLAGS_BASE_DRIVER += -Wno-invalid-source-encoding
-CFLAGS_BASE_DRIVER += -Wno-sometimes-uninitialized
-ifeq ($(shell clang -Wno-pointer-bool-conversion -Werror -E - < /dev/null > /dev/null 2>&1; echo $$?),0)
-CFLAGS_BASE_DRIVER += -Wno-pointer-bool-conversion
-endif
-else #ICC
-CFLAGS_qede_ethdev.o += -diag-disable 279 #279: controlling expression is constant
-endif
-
-#
-# Add extra flags for base ecore driver files
-# to disable warnings in them
-#
-#
-BASE_DRIVER_OBJS=$(sort $(patsubst %.c,%.o,$(notdir $(wildcard $(SRCDIR)/base/*.c))))
-$(foreach obj, $(BASE_DRIVER_OBJS), $(eval CFLAGS_$(obj)+=$(CFLAGS_BASE_DRIVER)))
-
-VPATH += $(SRCDIR)/base
-
-#
-# all source are stored in SRCS-y
-#
-SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += ecore_dev.c
-SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += ecore_hw.c
-SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += ecore_cxt.c
-SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += ecore_l2.c
-SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += ecore_sp_commands.c
-SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += ecore_init_fw_funcs.c
-SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += ecore_spq.c
-SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += ecore_init_ops.c
-SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += ecore_mcp.c
-SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += ecore_int.c
-SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += ecore_dcbx.c
-SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += bcm_osal.c
-SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += ecore_sriov.c
-SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += ecore_vf.c
-SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += qede_ethdev.c
-SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += qede_main.c
-SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += qede_rxtx.c
-SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += qede_filter.c
-SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += qede_debug.c
-SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += qede_regs.c
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/net/ring/Makefile b/drivers/net/ring/Makefile
deleted file mode 100644
index d6a3dec350..0000000000
--- a/drivers/net/ring/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-#
-# library name
-#
-LIB = librte_pmd_ring.a
-
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS)
-LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring
-LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs
-LDLIBS += -lrte_bus_vdev
-
-EXPORT_MAP := rte_pmd_ring_version.map
-
-#
-# all source are stored in SRCS-y
-#
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_RING) += rte_eth_ring.c
-
-#
-# Export include files
-#
-SYMLINK-y-include += rte_eth_ring.h
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/net/sfc/Makefile b/drivers/net/sfc/Makefile
deleted file mode 100644
index 20bf343814..0000000000
--- a/drivers/net/sfc/Makefile
+++ /dev/null
@@ -1,133 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-#
-# Copyright(c) 2019-2020 Xilinx, Inc.
-# Copyright(c) 2016-2019 Solarflare Communications Inc.
-#
-# This software was jointly developed between OKTET Labs (under contract
-# for Solarflare) and Solarflare Communications, Inc.
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-#
-# library name
-#
-LIB = librte_pmd_sfc_efx.a
-
-CFLAGS += -I$(SRCDIR)/base/
-CFLAGS += -I$(SRCDIR)
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS)
-# Strict-aliasing rules are violated by rte_eth_link to uint64_t casts
-CFLAGS += -Wno-strict-aliasing
-
-# Enable extra warnings
-CFLAGS += -Wextra
-
-# More warnings not enabled by above aggregators
-CFLAGS += -Wdisabled-optimization
-
-# Extra CFLAGS for base driver files
-CFLAGS_BASE_DRIVER += -Wno-sign-compare
-CFLAGS_BASE_DRIVER += -Wno-unused-parameter
-CFLAGS_BASE_DRIVER += -Wno-unused-variable
-
-# Compiler and version dependent flags
-ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y)
-CFLAGS += -Waggregate-return
-CFLAGS += -Wnested-externs
-CFLAGS_BASE_DRIVER += -Wno-empty-body
-CFLAGS_BASE_DRIVER += -Wno-unused-but-set-variable
-else ifeq ($(CONFIG_RTE_TOOLCHAIN_CLANG),y)
-CFLAGS += -Waggregate-return
-CFLAGS += -Wbad-function-cast
-CFLAGS_BASE_DRIVER += -Wno-empty-body
-else ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y)
-CFLAGS_BASE_DRIVER += -Wno-unused-but-set-variable
-# Suppress ICC false positive warning on 'bulk' may be used before its
-# value is set
-CFLAGS_sfc_ef10_tx.o += -diag-disable 3656
-endif
-LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring
-LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs
-LDLIBS += -lrte_bus_pci -lrte_pci
-
-#
-# List of base driver object files for which
-# special CFLAGS above should be applied
-#
-BASE_DRIVER_OBJS=$(sort $(patsubst %.c,%.o,$(notdir $(wildcard $(SRCDIR)/base/*.c))))
-$(foreach obj, $(BASE_DRIVER_OBJS), \
-  $(eval CFLAGS_$(obj)+=$(CFLAGS_BASE_DRIVER)))
-
-EXPORT_MAP := rte_pmd_sfc_version.map
-
-#
-# all source are stored in SRCS-y
-#
-SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += sfc_ethdev.c
-SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += sfc_kvargs.c
-SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += sfc.c
-SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += sfc_mcdi.c
-SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += sfc_intr.c
-SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += sfc_ev.c
-SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += sfc_port.c
-SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += sfc_rx.c
-SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += sfc_tx.c
-SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += sfc_tso.c
-SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += sfc_filter.c
-SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += sfc_flow.c
-SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += sfc_dp.c
-SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += sfc_ef10_rx.c
-SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += sfc_ef10_essb_rx.c
-SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += sfc_ef10_tx.c
-
-VPATH += $(SRCDIR)/base
-
-SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += efx_bootcfg.c
-SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += efx_crc32.c
-SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += efx_ev.c
-SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += efx_evb.c
-SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += efx_filter.c
-SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += efx_hash.c
-SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += efx_intr.c
-SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += efx_lic.c
-SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += efx_mac.c
-SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += efx_mcdi.c
-SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += efx_mon.c
-SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += efx_nic.c
-SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += efx_nvram.c
-SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += efx_phy.c
-SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += efx_port.c
-SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += efx_proxy.c
-SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += efx_rx.c
-SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += efx_sram.c
-SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += efx_tunnel.c
-SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += efx_tx.c
-SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += efx_vpd.c
-SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += mcdi_mon.c
-SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += siena_mac.c
-SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += siena_mcdi.c
-SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += siena_nic.c
-SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += siena_nvram.c
-SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += siena_phy.c
-SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += siena_sram.c
-SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += siena_vpd.c
-SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += ef10_ev.c
-SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += ef10_evb.c
-SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += ef10_filter.c
-SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += ef10_intr.c
-SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += ef10_image.c
-SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += ef10_mac.c
-SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += ef10_mcdi.c
-SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += ef10_nic.c
-SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += ef10_nvram.c
-SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += ef10_phy.c
-SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += ef10_proxy.c
-SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += ef10_rx.c
-SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += ef10_tx.c
-SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += ef10_vpd.c
-SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += hunt_nic.c
-SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += medford_nic.c
-SRCS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD) += medford2_nic.c
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/net/softnic/Makefile b/drivers/net/softnic/Makefile
deleted file mode 100644
index dabbe13a5f..0000000000
--- a/drivers/net/softnic/Makefile
+++ /dev/null
@@ -1,54 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2017 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-#
-# library name
-#
-LIB = librte_pmd_softnic.a
-
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS)
-LDLIBS += -lrte_pipeline -lrte_port -lrte_table
-LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring
-LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -lrte_sched
-LDLIBS += -lrte_cryptodev
-LDLIBS += -lrte_bus_vdev
-
-EXPORT_MAP := rte_pmd_softnic_version.map
-
-#
-# all source are stored in SRCS-y
-#
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_SOFTNIC) += rte_eth_softnic.c
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_SOFTNIC) += rte_eth_softnic_mempool.c
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_SOFTNIC) += rte_eth_softnic_swq.c
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_SOFTNIC) += rte_eth_softnic_link.c
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_SOFTNIC) += rte_eth_softnic_tm.c
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_SOFTNIC) += rte_eth_softnic_tap.c
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_SOFTNIC) += rte_eth_softnic_action.c
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_SOFTNIC) += rte_eth_softnic_pipeline.c
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_SOFTNIC) += rte_eth_softnic_thread.c
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_SOFTNIC) += rte_eth_softnic_cli.c
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_SOFTNIC) += rte_eth_softnic_flow.c
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_SOFTNIC) += rte_eth_softnic_meter.c
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_SOFTNIC) += rte_eth_softnic_cryptodev.c
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_SOFTNIC) += parser.c
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_SOFTNIC) += conn.c
-
-#
-# Export include files
-#
-SYMLINK-y-include += rte_eth_softnic.h
-
-ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),y)
-$(info Softnic PMD can only operate in a linux environment, \
-please change the definition of the RTE_TARGET environment variable)
-all:
-clean:
-else
-
-include $(RTE_SDK)/mk/rte.lib.mk
-
-endif
diff --git a/drivers/net/szedata2/Makefile b/drivers/net/szedata2/Makefile
deleted file mode 100644
index 675d0938a2..0000000000
--- a/drivers/net/szedata2/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2015 CESNET
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-#
-# library name
-#
-LIB = librte_pmd_szedata2.a
-
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS)
-LDLIBS += -lsze2
-LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring
-LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs
-LDLIBS += -lrte_bus_pci
-
-EXPORT_MAP := rte_pmd_szedata2_version.map
-
-#
-# all source are stored in SRCS-y
-#
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_SZEDATA2) += rte_eth_szedata2.c
-
-#
-# Export include files
-#
-SYMLINK-y-include +=
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/net/tap/Makefile b/drivers/net/tap/Makefile
deleted file mode 100644
index cbf87af401..0000000000
--- a/drivers/net/tap/Makefile
+++ /dev/null
@@ -1,97 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2016 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-#
-# library name
-#
-LIB = librte_pmd_tap.a
-
-EXPORT_MAP := rte_pmd_tap_version.map
-
-#
-# TAP_MAX_QUEUES must be a power of 2
-#
-ifeq ($(TAP_MAX_QUEUES),)
-	TAP_MAX_QUEUES = 16
-endif
-CFLAGS += -O3
-CFLAGS += -I$(SRCDIR)
-CFLAGS += -I.
-CFLAGS += $(WERROR_FLAGS)
-LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring
-LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -lrte_hash
-LDLIBS += -lrte_bus_vdev -lrte_gso
-
-CFLAGS += -DTAP_MAX_QUEUES=$(TAP_MAX_QUEUES)
-
-#
-# all source are stored in SRCS-y
-#
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_TAP) += rte_eth_tap.c
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_TAP) += tap_flow.c
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_TAP) += tap_netlink.c
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_TAP) += tap_tcmsgs.c
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_TAP) += tap_bpf_api.c
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_TAP) += tap_intr.c
-
-include $(RTE_SDK)/mk/rte.lib.mk
-
-# Generate and clean-up tap_autoconf.h.
-
-export CC CFLAGS CPPFLAGS EXTRA_CFLAGS EXTRA_CPPFLAGS
-export AUTO_CONFIG_CFLAGS = -Wno-error
-
-ifndef V
-AUTOCONF_OUTPUT := >/dev/null
-endif
-
-tap_autoconf.h.new: FORCE
-
-tap_autoconf.h.new: $(RTE_SDK)/buildtools/auto-config-h.sh
-	$Q $(RM) -f -- '$@'
-	$Q sh -- '$<' '$@' \
-		HAVE_TC_FLOWER \
-		linux/pkt_cls.h \
-		enum TCA_FLOWER_UNSPEC \
-		$(AUTOCONF_OUTPUT)
-	$Q sh -- '$<' '$@' \
-		HAVE_TC_VLAN_ID \
-		linux/pkt_cls.h \
-		enum TCA_FLOWER_KEY_VLAN_PRIO \
-		$(AUTOCONF_OUTPUT)
-	$Q sh -- '$<' '$@' \
-		HAVE_TC_BPF \
-		linux/pkt_cls.h \
-		enum TCA_BPF_UNSPEC \
-		$(AUTOCONF_OUTPUT)
-	$Q sh -- '$<' '$@' \
-		HAVE_TC_BPF_FD \
-		linux/pkt_cls.h \
-		enum TCA_BPF_FD \
-		$(AUTOCONF_OUTPUT)
-	$Q sh -- '$<' '$@' \
-		HAVE_TC_ACT_BPF \
-		linux/tc_act/tc_bpf.h \
-		enum TCA_ACT_BPF_UNSPEC \
-		$(AUTOCONF_OUTPUT)
-	$Q sh -- '$<' '$@' \
-		HAVE_TC_ACT_BPF_FD \
-		linux/tc_act/tc_bpf.h \
-		enum TCA_ACT_BPF_FD \
-		$(AUTOCONF_OUTPUT)
-
-# Create tap_autoconf.h or update it in case it differs from the new one.
-
-tap_autoconf.h: tap_autoconf.h.new
-	$Q [ -f '$@' ] && \
-		cmp '$<' '$@' $(AUTOCONF_OUTPUT) || \
-		mv '$<' '$@'
-
-$(SRCS-$(CONFIG_RTE_LIBRTE_PMD_TAP):.c=.o): tap_autoconf.h
-
-clean_tap: FORCE
-	$Q rm -f -- tap_autoconf.h tap_autoconf.h.new
-
-clean: clean_tap
diff --git a/drivers/net/thunderx/Makefile b/drivers/net/thunderx/Makefile
deleted file mode 100644
index 149638a499..0000000000
--- a/drivers/net/thunderx/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2016 Cavium, Inc
-#
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-#
-# library name
-#
-LIB = librte_pmd_thunderx_nicvf.a
-
-CFLAGS += $(WERROR_FLAGS)
-
-LDLIBS += -lm
-LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring
-LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs
-LDLIBS += -lrte_bus_pci
-
-EXPORT_MAP := rte_pmd_thunderx_version.map
-
-OBJS_BASE_DRIVER=$(sort $(patsubst %.c,%.o,$(notdir $(wildcard $(SRCDIR)/base/*.c))))
-$(foreach obj, $(OBJS_BASE_DRIVER), $(eval CFLAGS_$(obj)+=$(CFLAGS_BASE_DRIVER)))
-
-VPATH += $(SRCDIR)/base
-
-#
-# all source are stored in SRCS-y
-#
-SRCS-$(CONFIG_RTE_LIBRTE_THUNDERX_NICVF_PMD) += nicvf_rxtx.c
-SRCS-$(CONFIG_RTE_LIBRTE_THUNDERX_NICVF_PMD) += nicvf_hw.c
-SRCS-$(CONFIG_RTE_LIBRTE_THUNDERX_NICVF_PMD) += nicvf_mbox.c
-SRCS-$(CONFIG_RTE_LIBRTE_THUNDERX_NICVF_PMD) += nicvf_ethdev.c
-SRCS-$(CONFIG_RTE_LIBRTE_THUNDERX_NICVF_PMD) += nicvf_bsvf.c
-SRCS-$(CONFIG_RTE_LIBRTE_THUNDERX_NICVF_PMD) += nicvf_svf.c
-
-ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y)
-CFLAGS_nicvf_rxtx.o += -fno-prefetch-loop-arrays
-endif
-CFLAGS_nicvf_rxtx.o += -Ofast
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/net/vdev_netvsc/Makefile b/drivers/net/vdev_netvsc/Makefile
deleted file mode 100644
index 01d26fb798..0000000000
--- a/drivers/net/vdev_netvsc/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2017 6WIND S.A.
-# Copyright 2017 Mellanox Technologies, Ltd
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-# Properties of the generated library.
-LIB = librte_pmd_vdev_netvsc.a
-EXPORT_MAP := rte_pmd_vdev_netvsc_version.map
-
-# Additional compilation flags.
-CFLAGS += -O3
-CFLAGS += -g
-CFLAGS += -Wall -Wextra
-CFLAGS += -D_XOPEN_SOURCE=600
-CFLAGS += -D_BSD_SOURCE
-CFLAGS += -D_DEFAULT_SOURCE
-CFLAGS += $(WERROR_FLAGS)
-
-# Dependencies.
-LDLIBS += -lrte_bus_vdev
-LDLIBS += -lrte_eal
-LDLIBS += -lrte_ethdev
-LDLIBS += -lrte_kvargs
-LDLIBS += -lrte_net
-
-# Source files.
-SRCS-$(CONFIG_RTE_LIBRTE_VDEV_NETVSC_PMD) += vdev_netvsc.c
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/net/vhost/Makefile b/drivers/net/vhost/Makefile
deleted file mode 100644
index 0461e29f2c..0000000000
--- a/drivers/net/vhost/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2016 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-#
-# library name
-#
-LIB = librte_pmd_vhost.a
-
-LDLIBS += -lpthread
-LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring
-LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -lrte_vhost
-LDLIBS += -lrte_bus_vdev
-
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS)
-
-EXPORT_MAP := rte_pmd_vhost_version.map
-
-#
-# all source are stored in SRCS-y
-#
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_VHOST) += rte_eth_vhost.c
-
-#
-# Export include files
-#
-SYMLINK-y-include += rte_eth_vhost.h
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/net/virtio/Makefile b/drivers/net/virtio/Makefile
deleted file mode 100644
index 102b1deab8..0000000000
--- a/drivers/net/virtio/Makefile
+++ /dev/null
@@ -1,82 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-#
-# library name
-#
-LIB = librte_pmd_virtio.a
-
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS)
-LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring
-LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs
-LDLIBS += -lrte_bus_pci
-ifeq ($(CONFIG_RTE_VIRTIO_USER),y)
-LDLIBS += -lrte_bus_vdev
-endif
-
-EXPORT_MAP := rte_pmd_virtio_version.map
-
-#
-# all source are stored in SRCS-y
-#
-SRCS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += virtqueue.c
-SRCS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += virtio_pci.c
-SRCS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += virtio_rxtx.c
-SRCS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += virtio_ethdev.c
-SRCS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += virtio_rxtx_simple.c
-
-ifeq ($(CONFIG_RTE_ARCH_X86),y)
-SRCS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += virtio_rxtx_simple_sse.c
-else ifeq ($(CONFIG_RTE_ARCH_PPC_64),y)
-SRCS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += virtio_rxtx_simple_altivec.c
-else ifneq ($(filter y,$(CONFIG_RTE_ARCH_ARM) $(CONFIG_RTE_ARCH_ARM64)),)
-SRCS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += virtio_rxtx_simple_neon.c
-endif
-
-ifneq ($(FORCE_DISABLE_AVX512), y)
-	CC_AVX512_SUPPORT=\
-	$(shell $(CC) -march=native -dM -E - </dev/null 2>&1 | \
-	sed '/./{H;$$!d} ; x ; /AVX512F/!d; /AVX512BW/!d; /AVX512VL/!d' | \
-	grep -q AVX512 && echo 1)
-endif
-
-ifeq ($(CC_AVX512_SUPPORT), 1)
-CFLAGS += -DCC_AVX512_SUPPORT
-SRCS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += virtio_rxtx_packed_avx.c
-
-ifeq ($(RTE_TOOLCHAIN), gcc)
-ifeq ($(shell test $(GCC_VERSION) -ge 83 && echo 1), 1)
-CFLAGS += -DVIRTIO_GCC_UNROLL_PRAGMA
-endif
-endif
-
-ifeq ($(RTE_TOOLCHAIN), clang)
-ifeq ($(shell test $(CLANG_MAJOR_VERSION)$(CLANG_MINOR_VERSION) -ge 37 && echo 1), 1)
-CFLAGS += -DVIRTIO_CLANG_UNROLL_PRAGMA
-endif
-endif
-
-ifeq ($(RTE_TOOLCHAIN), icc)
-ifeq ($(shell test $(ICC_MAJOR_VERSION) -ge 16 && echo 1), 1)
-CFLAGS += -DVIRTIO_ICC_UNROLL_PRAGMA
-endif
-endif
-
-CFLAGS_virtio_rxtx_packed_avx.o += -mavx512f -mavx512bw -mavx512vl
-ifeq ($(shell test $(GCC_VERSION) -ge 100 && echo 1), 1)
-CFLAGS_virtio_rxtx_packed_avx.o += -Wno-zero-length-bounds
-endif
-endif
-
-ifeq ($(CONFIG_RTE_VIRTIO_USER),y)
-SRCS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += virtio_user/vhost_user.c
-SRCS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += virtio_user/vhost_kernel.c
-SRCS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += virtio_user/vhost_kernel_tap.c
-SRCS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += virtio_user/virtio_user_dev.c
-SRCS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD) += virtio_user_ethdev.c
-endif
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/net/vmxnet3/Makefile b/drivers/net/vmxnet3/Makefile
deleted file mode 100644
index 4390fedee0..0000000000
--- a/drivers/net/vmxnet3/Makefile
+++ /dev/null
@@ -1,53 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2015 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-#
-# library name
-#
-LIB = librte_pmd_vmxnet3_uio.a
-
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS)
-
-ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y)
-#
-# CFLAGS for icc
-#
-CFLAGS_BASE_DRIVER  = -diag-disable 174 -diag-disable 593 -diag-disable 869
-CFLAGS_BASE_DRIVER += -diag-disable 981 -diag-disable 2259
-
-else ifeq ($(CONFIG_RTE_TOOLCHAIN_CLANG),y)
-#
-# CFLAGS for clang
-#
-CFLAGS_BASE_DRIVER = -Wno-unused-parameter -Wno-unused-value
-CFLAGS_BASE_DRIVER += -Wno-strict-aliasing -Wno-format-extra-args
-
-else
-#
-# CFLAGS for gcc
-#
-ifeq ($(shell test $(GCC_VERSION) -ge 44 && echo 1), 1)
-CFLAGS     += -Wno-deprecated
-endif
-CFLAGS_BASE_DRIVER = -Wno-unused-parameter -Wno-unused-value
-CFLAGS_BASE_DRIVER += -Wno-strict-aliasing -Wno-format-extra-args
-
-endif
-LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring
-LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs
-LDLIBS += -lrte_bus_pci
-
-VPATH += $(SRCDIR)/base
-
-EXPORT_MAP := rte_pmd_vmxnet3_version.map
-
-#
-# all source are stored in SRCS-y
-#
-SRCS-$(CONFIG_RTE_LIBRTE_VMXNET3_PMD) += vmxnet3_rxtx.c
-SRCS-$(CONFIG_RTE_LIBRTE_VMXNET3_PMD) += vmxnet3_ethdev.c
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/raw/Makefile b/drivers/raw/Makefile
deleted file mode 100644
index 80b043eb14..0000000000
--- a/drivers/raw/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2017 NXP
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-# DIRS-$(<configuration>) += <directory>
-DIRS-$(CONFIG_RTE_LIBRTE_PMD_SKELETON_RAWDEV) += skeleton
-ifeq ($(CONFIG_RTE_EAL_VFIO)$(CONFIG_RTE_LIBRTE_FSLMC_BUS),yy)
-DIRS-$(CONFIG_RTE_LIBRTE_PMD_DPAA2_CMDIF_RAWDEV) += dpaa2_cmdif
-DIRS-$(CONFIG_RTE_LIBRTE_PMD_DPAA2_QDMA_RAWDEV) += dpaa2_qdma
-endif
-DIRS-$(CONFIG_RTE_LIBRTE_PMD_IFPGA_RAWDEV) += ifpga
-DIRS-$(CONFIG_RTE_LIBRTE_PMD_IOAT_RAWDEV) += ioat
-DIRS-$(CONFIG_RTE_LIBRTE_PMD_NTB_RAWDEV) += ntb
-DIRS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_DMA_RAWDEV) += octeontx2_dma
-DIRS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EP_RAWDEV) += octeontx2_ep
-
-include $(RTE_SDK)/mk/rte.subdir.mk
diff --git a/drivers/raw/dpaa2_cmdif/Makefile b/drivers/raw/dpaa2_cmdif/Makefile
deleted file mode 100644
index 227ec4896e..0000000000
--- a/drivers/raw/dpaa2_cmdif/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2018 NXP
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-#
-# library name
-#
-LIB = librte_rawdev_dpaa2_cmdif.a
-
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS)
-
-CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc
-CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc/qbman/include
-CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax
-
-LDLIBS += -lrte_bus_fslmc
-LDLIBS += -lrte_bus_vdev
-LDLIBS += -lrte_eal
-LDLIBS += -lrte_kvargs
-LDLIBS += -lrte_mempool_dpaa2
-LDLIBS += -lrte_rawdev
-LDLIBS += -lrte_common_dpaax
-
-EXPORT_MAP := rte_rawdev_dpaa2_cmdif_version.map
-
-#
-# all source are stored in SRCS-y
-#
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_DPAA2_CMDIF_RAWDEV) += dpaa2_cmdif.c
-
-SYMLINK-$(CONFIG_RTE_LIBRTE_PMD_DPAA2_CMDIF_RAWDEV)-include += rte_pmd_dpaa2_cmdif.h
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/raw/dpaa2_qdma/Makefile b/drivers/raw/dpaa2_qdma/Makefile
deleted file mode 100644
index 7b2abdddb4..0000000000
--- a/drivers/raw/dpaa2_qdma/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2018 NXP
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-#
-# library name
-#
-LIB = librte_rawdev_dpaa2_qdma.a
-
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS)
-
-CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc
-CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc/qbman/include
-CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax
-
-LDLIBS += -lrte_bus_fslmc
-LDLIBS += -lrte_eal
-LDLIBS += -lrte_mempool
-LDLIBS += -lrte_mempool_dpaa2
-LDLIBS += -lrte_rawdev
-LDLIBS += -lrte_kvargs
-LDLIBS += -lrte_ring
-LDLIBS += -lrte_common_dpaax
-
-EXPORT_MAP := rte_rawdev_dpaa2_qdma_version.map
-
-#
-# all source are stored in SRCS-y
-#
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_DPAA2_QDMA_RAWDEV) += dpaa2_qdma.c
-
-SYMLINK-$(CONFIG_RTE_LIBRTE_PMD_DPAA2_QDMA_RAWDEV)-include += rte_pmd_dpaa2_qdma.h
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/raw/ifpga/Makefile b/drivers/raw/ifpga/Makefile
deleted file mode 100644
index 371e127f19..0000000000
--- a/drivers/raw/ifpga/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2018 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-#
-# library name
-#
-LIB = librte_rawdev_ifpga.a
-
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS)
-CFLAGS += -I$(RTE_SDK)/drivers/bus/ifpga
-CFLAGS += -I$(RTE_SDK)/drivers/raw/ifpga_rawdev
-CFLAGS += -I$(RTE_SDK)/drivers/net/i40e
-CFLAGS += -I$(RTE_SDK)/drivers/net/ipn3ke
-LDLIBS += -lrte_eal
-LDLIBS += -lrte_rawdev
-LDLIBS += -lrte_bus_vdev
-LDLIBS += -lrte_kvargs
-LDLIBS += -lrte_bus_pci
-LDLIBS += -lrte_bus_ifpga
-LDLIBS += -lpthread
-LDLIBS += -lfdt
-LDLIBS += -lrte_pmd_i40e
-LDLIBS += -lrte_pmd_ipn3ke
-
-EXPORT_MAP := rte_rawdev_ifpga_version.map
-
-VPATH += $(SRCDIR)/base
-
-include $(RTE_SDK)/drivers/raw/ifpga/base/Makefile
-
-#
-# all source are stored in SRCS-y
-#
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_IFPGA_RAWDEV) += ifpga_rawdev.c
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/raw/ifpga/base/Makefile b/drivers/raw/ifpga/base/Makefile
deleted file mode 100644
index c5bbcbd5f8..0000000000
--- a/drivers/raw/ifpga/base/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@ 
-#SPDX-License-Identifier: BSD-3-Clause
-#Copyright(c) 2010-2018 Intel Corporation
-
-ifneq ($(CONFIG_RTE_LIBRTE_EAL),)
-OSDEP := osdep_rte
-else
-OSDEP := osdep_raw
-endif
-
-CFLAGS += -I$(RTE_SDK)/drivers/raw/ifpga_rawdev/base/$(OSDEP)
-
-SRCS-y += ifpga_api.c
-SRCS-y += ifpga_enumerate.c
-SRCS-y += ifpga_feature_dev.c
-SRCS-y += ifpga_fme.c
-SRCS-y += ifpga_fme_iperf.c
-SRCS-y += ifpga_fme_dperf.c
-SRCS-y += ifpga_fme_error.c
-SRCS-y += ifpga_port.c
-SRCS-y += ifpga_port_error.c
-SRCS-y += opae_hw_api.c
-SRCS-y += opae_ifpga_hw_api.c
-SRCS-y += opae_debug.c
-SRCS-y += ifpga_fme_pr.c
-SRCS-y += opae_spi.c
-SRCS-y += opae_spi_transaction.c
-SRCS-y += opae_intel_max10.c
-SRCS-y += opae_i2c.c
-SRCS-y += opae_at24_eeprom.c
-SRCS-y += opae_eth_group.c
-
-SRCS-y += $(wildcard $(SRCDIR)/base/$(OSDEP)/*.c)
diff --git a/drivers/raw/ioat/Makefile b/drivers/raw/ioat/Makefile
deleted file mode 100644
index 1609fe5e6c..0000000000
--- a/drivers/raw/ioat/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2019 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-# library name
-LIB = librte_rawdev_ioat.a
-
-# build flags
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS)
-
-LDLIBS += -lrte_eal -lrte_rawdev
-LDLIBS += -lrte_pci -lrte_bus_pci
-LDLIBS += -lrte_mbuf -lrte_mempool
-
-# versioning export map
-EXPORT_MAP := rte_rawdev_ioat_version.map
-
-# library source files
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_IOAT_RAWDEV) += ioat_rawdev.c
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_IOAT_RAWDEV) += ioat_rawdev_test.c
-
-# export include files
-SYMLINK-y-include += rte_ioat_rawdev.h
-SYMLINK-y-include += rte_ioat_spec.h
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/raw/ntb/Makefile b/drivers/raw/ntb/Makefile
deleted file mode 100644
index 8f0bff9b02..0000000000
--- a/drivers/raw/ntb/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2019 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-#
-# library name
-#
-LIB = librte_rawdev_ntb.a
-
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS)
-LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool
-LDLIBS += -lrte_pci -lrte_bus_pci
-LDLIBS += -lrte_rawdev
-
-EXPORT_MAP := rte_rawdev_ntb_version.map
-
-#
-# all source are stored in SRCS-y
-#
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_NTB_RAWDEV) += ntb.c
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_NTB_RAWDEV) += ntb_hw_intel.c
-
-# install this header file
-SYMLINK-$(CONFIG_RTE_LIBRTE_PMD_NTB_RAWDEV)-include := rte_pmd_ntb.h
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/raw/octeontx2_dma/Makefile b/drivers/raw/octeontx2_dma/Makefile
deleted file mode 100644
index c64ca3497a..0000000000
--- a/drivers/raw/octeontx2_dma/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(C) 2019 Marvell International Ltd.
-#
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-# library name
-LIB = librte_rawdev_octeontx2_dma.a
-
-CFLAGS += -O3 $(WERROR_FLAGS)
-CFLAGS += -I$(RTE_SDK)/drivers/common/octeontx2/
-CFLAGS += -I$(RTE_SDK)/drivers/mempool/octeontx2/
-CFLAGS += -I$(RTE_SDK)/drivers/raw/octeontx2_dma/
-LDLIBS += -lrte_eal -lrte_rawdev -lrte_bus_pci -lrte_mbuf
-LDLIBS += -lrte_common_octeontx2 -lrte_mempool
-
-ifneq ($(CONFIG_RTE_ARCH_64),y)
-CFLAGS += -Wno-int-to-pointer-cast
-CFLAGS += -Wno-pointer-to-int-cast
-ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y)
-CFLAGS += -diag-disable 2259
-endif
-endif
-
-EXPORT_MAP := rte_rawdev_octeontx2_dma_version.map
-
-#
-# all source are stored in SRCS-y
-#
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_DMA_RAWDEV) += otx2_dpi_rawdev.c
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_DMA_RAWDEV) += otx2_dpi_msg.c
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_DMA_RAWDEV) += otx2_dpi_test.c
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/raw/octeontx2_ep/Makefile b/drivers/raw/octeontx2_ep/Makefile
deleted file mode 100644
index 1a54bf56f0..0000000000
--- a/drivers/raw/octeontx2_ep/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(C) 2019 Marvell International Ltd.
-#
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-# Library name
-LIB = librte_rawdev_octeontx2_ep.a
-
-# Build flags
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS)
-
-CFLAGS += -I$(RTE_SDK)/drivers/common/octeontx2/
-CFLAGS += -I$(RTE_SDK)/drivers/raw/octeontx2_ep/
-
-LDLIBS += -lrte_eal
-LDLIBS += -lrte_rawdev
-LDLIBS += -lrte_bus_pci
-LDLIBS += -lrte_mempool
-LDLIBS += -lrte_common_octeontx2
-
-ifneq ($(CONFIG_RTE_ARCH_64),y)
-CFLAGS += -Wno-int-to-pointer-cast
-CFLAGS += -Wno-pointer-to-int-cast
-ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y)
-CFLAGS += -diag-disable 2259
-endif
-endif
-
-EXPORT_MAP := rte_rawdev_octeontx2_ep_version.map
-
-#
-# All source are stored in SRCS-y
-#
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EP_RAWDEV) += otx2_ep_rawdev.c
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EP_RAWDEV) += otx2_ep_enqdeq.c
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EP_RAWDEV) += otx2_ep_test.c
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EP_RAWDEV) += otx2_ep_vf.c
-
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/raw/skeleton/Makefile b/drivers/raw/skeleton/Makefile
deleted file mode 100644
index 2ac66fbd45..0000000000
--- a/drivers/raw/skeleton/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2017 NXP
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-#
-# library name
-#
-LIB = librte_rawdev_skeleton.a
-
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS)
-LDLIBS += -lrte_eal
-LDLIBS += -lrte_rawdev
-LDLIBS += -lrte_bus_vdev
-LDLIBS += -lrte_kvargs
-
-EXPORT_MAP := rte_rawdev_skeleton_version.map
-
-#
-# all source are stored in SRCS-y
-#
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_SKELETON_RAWDEV) += skeleton_rawdev.c
-SRCS-$(CONFIG_RTE_LIBRTE_PMD_SKELETON_RAWDEV) += skeleton_rawdev_test.c
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/regex/Makefile b/drivers/regex/Makefile
deleted file mode 100644
index 906b20546f..0000000000
--- a/drivers/regex/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2020 Mellanox Technologies, Ltd
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-DIRS-$(CONFIG_RTE_LIBRTE_MLX5_REGEX_PMD) += mlx5
-
-include $(RTE_SDK)/mk/rte.subdir.mk
diff --git a/drivers/regex/mlx5/Makefile b/drivers/regex/mlx5/Makefile
deleted file mode 100644
index 11e3325feb..0000000000
--- a/drivers/regex/mlx5/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2020 Mellanox Technologies, Ltd
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-# Library name.
-LIB = librte_pmd_mlx5_regex.a
-
-# Sources.
-SRCS-$(CONFIG_RTE_LIBRTE_MLX5_REGEX_PMD) += mlx5_regex.c
-SRCS-$(CONFIG_RTE_LIBRTE_MLX5_REGEX_PMD) += mlx5_rxp.c
-SRCS-$(CONFIG_RTE_LIBRTE_MLX5_REGEX_PMD) += mlx5_regex_devx.c
-SRCS-$(CONFIG_RTE_LIBRTE_MLX5_REGEX_PMD) += mlx5_regex_control.c
-SRCS-$(CONFIG_RTE_LIBRTE_MLX5_REGEX_PMD) += mlx5_regex_fastpath.c
-
-# Basic CFLAGS.
-CFLAGS += -O3
-CFLAGS += -std=c11 -Wall -Wextra
-CFLAGS += -g
-CFLAGS += -I$(RTE_SDK)/drivers/common/mlx5
-CFLAGS += -I$(BUILDDIR)/drivers/common/mlx5
-CFLAGS += -I$(RTE_SDK)/drivers/common/mlx5/linux
-CFLAGS += -I$(BUILDDIR)/drivers/common/mlx5/linux
-CFLAGS += -D_BSD_SOURCE
-CFLAGS += -D_DEFAULT_SOURCE
-CFLAGS += -D_XOPEN_SOURCE=600
-CFLAGS += $(WERROR_FLAGS)
-CFLAGS += -Wno-strict-prototypes
-LDLIBS += -lrte_common_mlx5
-LDLIBS += -lm
-LDLIBS += -lrte_eal -lrte_mbuf -lrte_regexdev
-LDLIBS += -lrte_kvargs
-LDLIBS += -lrte_bus_pci
-LDLIBS += -lrte_pci
-
-# A few warnings cannot be avoided in external headers.
-CFLAGS += -Wno-error=cast-qual
-
-EXPORT_MAP := rte_pmd_mlx5_regex_version.map
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/vdpa/Makefile b/drivers/vdpa/Makefile
deleted file mode 100644
index 6e8835948e..0000000000
--- a/drivers/vdpa/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2019 Mellanox Technologies, Ltd
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-ifeq ($(CONFIG_RTE_EAL_VFIO),y)
-DIRS-$(CONFIG_RTE_LIBRTE_IFC_PMD) += ifc
-endif
-
-DIRS-$(CONFIG_RTE_LIBRTE_MLX5_VDPA_PMD) += mlx5
-
-include $(RTE_SDK)/mk/rte.subdir.mk
diff --git a/drivers/vdpa/ifc/Makefile b/drivers/vdpa/ifc/Makefile
deleted file mode 100644
index b468bfdbdd..0000000000
--- a/drivers/vdpa/ifc/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2018 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-#
-# library name
-#
-LIB = librte_pmd_ifc.a
-
-LDLIBS += -lpthread
-LDLIBS += -lrte_eal -lrte_pci -lrte_vhost -lrte_bus_pci
-LDLIBS += -lrte_kvargs
-
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS)
-
-#
-# Add extra flags for base driver source files to disable warnings in them
-#
-BASE_DRIVER_OBJS=$(sort $(patsubst %.c,%.o,$(notdir $(wildcard $(SRCDIR)/base/*.c))))
-
-VPATH += $(SRCDIR)/base
-
-EXPORT_MAP := rte_pmd_ifc_version.map
-
-#
-# all source are stored in SRCS-y
-#
-SRCS-$(CONFIG_RTE_LIBRTE_IFC_PMD) += ifcvf_vdpa.c
-SRCS-$(CONFIG_RTE_LIBRTE_IFC_PMD) += ifcvf.c
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/vdpa/mlx5/Makefile b/drivers/vdpa/mlx5/Makefile
deleted file mode 100644
index d46699fbc9..0000000000
--- a/drivers/vdpa/mlx5/Makefile
+++ /dev/null
@@ -1,58 +0,0 @@ 
-#   SPDX-License-Identifier: BSD-3-Clause
-#   Copyright 2019 Mellanox Technologies, Ltd
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-# Library name.
-LIB = librte_pmd_mlx5_vdpa.a
-
-# Sources.
-SRCS-$(CONFIG_RTE_LIBRTE_MLX5_VDPA_PMD) += mlx5_vdpa.c
-SRCS-$(CONFIG_RTE_LIBRTE_MLX5_VDPA_PMD) += mlx5_vdpa_mem.c
-SRCS-$(CONFIG_RTE_LIBRTE_MLX5_VDPA_PMD) += mlx5_vdpa_event.c
-SRCS-$(CONFIG_RTE_LIBRTE_MLX5_VDPA_PMD) += mlx5_vdpa_virtq.c
-SRCS-$(CONFIG_RTE_LIBRTE_MLX5_VDPA_PMD) += mlx5_vdpa_steer.c
-SRCS-$(CONFIG_RTE_LIBRTE_MLX5_VDPA_PMD) += mlx5_vdpa_lm.c
-
-
-# Basic CFLAGS.
-CFLAGS += -O3
-CFLAGS += -std=c11 -Wall -Wextra
-CFLAGS += -g
-CFLAGS += -I$(RTE_SDK)/drivers/common/mlx5
-CFLAGS += -I$(RTE_SDK)/drivers/common/mlx5/linux
-CFLAGS += -I$(RTE_SDK)/drivers/net/mlx5_vdpa
-CFLAGS += -I$(RTE_SDK)/lib/librte_sched
-CFLAGS += -I$(BUILDDIR)/drivers/common/mlx5
-CFLAGS += -D_BSD_SOURCE
-CFLAGS += -D_DEFAULT_SOURCE
-CFLAGS += -D_XOPEN_SOURCE=600
-CFLAGS += $(WERROR_FLAGS)
-CFLAGS += -Wno-strict-prototypes
-LDLIBS += -lrte_common_mlx5
-LDLIBS += -lrte_eal -lrte_vhost -lrte_kvargs -lrte_pci -lrte_sched
-LDLIBS += -pthread
-
-# A few warnings cannot be avoided in external headers.
-CFLAGS += -Wno-error=cast-qual
-
-EXPORT_MAP := rte_pmd_mlx5_vdpa_version.map
-
-# DEBUG which is usually provided on the command-line may enable
-# CONFIG_RTE_LIBRTE_MLX5_DEBUG.
-ifeq ($(DEBUG),1)
-CONFIG_RTE_LIBRTE_MLX5_DEBUG := y
-endif
-
-# User-defined CFLAGS.
-ifeq ($(CONFIG_RTE_LIBRTE_MLX5_DEBUG),y)
-CFLAGS += -pedantic
-ifneq ($(CONFIG_RTE_TOOLCHAIN_ICC),y)
-CFLAGS += -DPEDANTIC
-endif
-AUTO_CONFIG_CFLAGS += -Wno-pedantic
-else
-CFLAGS += -UPEDANTIC
-endif
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/examples/Makefile b/examples/Makefile
deleted file mode 100644
index b7e99a2f78..0000000000
--- a/examples/Makefile
+++ /dev/null
@@ -1,90 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2016 6WIND S.A.
-
-ifeq ($(RTE_SDK),)
-$(error "Please define RTE_SDK environment variable")
-endif
-
-# Default target, detect a build directory, by looking for a path with a .config
-RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config)))))
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-DIRS-$(CONFIG_RTE_LIBRTE_BBDEV) += bbdev_app
-DIRS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += bond
-DIRS-y += cmdline
-ifeq ($(CONFIG_RTE_LIBRTE_POWER),y)
-DIRS-$(CONFIG_RTE_LIBRTE_DISTRIBUTOR) += distributor
-endif
-DIRS-y += ethtool
-DIRS-$(CONFIG_RTE_LIBRTE_EFD) += server_node_efd
-DIRS-$(CONFIG_RTE_LIBRTE_CRYPTODEV) += fips_validation
-DIRS-$(CONFIG_RTE_LIBRTE_FLOW_CLASSIFY) += flow_classify
-DIRS-y += flow_filtering
-DIRS-y += helloworld
-ifeq ($(CONFIG_RTE_LIBRTE_PMD_IOAT_RAWDEV),y)
-DIRS-$(CONFIG_RTE_LIBRTE_PMD_IOAT_RAWDEV) += ioat
-endif
-DIRS-$(CONFIG_RTE_LIBRTE_PIPELINE) += ip_pipeline
-ifeq ($(CONFIG_RTE_LIBRTE_LPM),y)
-DIRS-$(CONFIG_RTE_IP_FRAG) += ip_reassembly
-DIRS-$(CONFIG_RTE_IP_FRAG) += ip_fragmentation
-endif
-ifeq ($(CONFIG_RTE_LIBRTE_ACL)$(CONFIG_RTE_LIBRTE_HASH)$(CONFIG_RTE_LIBRTE_LPM)$(CONFIG_RTE_LIBRTE_SECURITY),yyyy)
-DIRS-$(CONFIG_RTE_LIBRTE_CRYPTODEV) += ipsec-secgw
-endif
-DIRS-$(CONFIG_RTE_LIBRTE_HASH) += ipv4_multicast
-DIRS-$(CONFIG_RTE_LIBRTE_KNI) += kni
-DIRS-y += l2fwd
-DIRS-y += l2fwd-event
-ifneq ($(PQOS_INSTALL_PATH),)
-DIRS-y += l2fwd-cat
-endif
-DIRS-$(CONFIG_RTE_LIBRTE_CRYPTODEV) += l2fwd-crypto
-DIRS-$(CONFIG_RTE_LIBRTE_JOBSTATS) += l2fwd-jobstats
-DIRS-y += l2fwd-keepalive
-DIRS-y += l2fwd-keepalive/ka-agent
-ifeq ($(CONFIG_RTE_LIBRTE_HASH),y)
-DIRS-$(CONFIG_RTE_LIBRTE_LPM) += l3fwd
-endif
-DIRS-$(CONFIG_RTE_LIBRTE_ACL) += l3fwd-acl
-ifeq ($(CONFIG_RTE_LIBRTE_LPM)$(CONFIG_RTE_LIBRTE_HASH),yy)
-DIRS-$(CONFIG_RTE_LIBRTE_POWER) += l3fwd-power
-endif
-ifeq ($(CONFIG_RTE_LIBRTE_GRAPH),y)
-DIRS-y += l3fwd-graph
-endif
-DIRS-y += link_status_interrupt
-DIRS-y += multi_process
-DIRS-y += ntb
-DIRS-$(CONFIG_RTE_LIBRTE_REORDER) += packet_ordering
-ifeq ($(CONFIG_RTE_ARCH_X86_64),y)
-DIRS-y += performance-thread
-endif
-DIRS-$(CONFIG_RTE_LIBRTE_IEEE1588) += ptpclient
-DIRS-$(CONFIG_RTE_LIBRTE_METER) += qos_meter
-DIRS-$(CONFIG_RTE_LIBRTE_SCHED) += qos_sched
-DIRS-$(CONFIG_RTE_ETHDEV_RXTX_CALLBACKS) += rxtx_callbacks
-DIRS-y += service_cores
-DIRS-y += skeleton
-ifeq ($(CONFIG_RTE_LIBRTE_HASH),y)
-DIRS-$(CONFIG_RTE_LIBRTE_VHOST) += tep_termination
-endif
-DIRS-$(CONFIG_RTE_LIBRTE_TIMER) += timer
-DIRS-$(CONFIG_RTE_LIBRTE_VHOST) += vhost vdpa vhost_blk
-ifeq ($(CONFIG_RTE_LIBRTE_CRYPTODEV),y)
-DIRS-$(CONFIG_RTE_LIBRTE_VHOST) += vhost_crypto
-endif
-DIRS-y += vmdq
-DIRS-y += vmdq_dcb
-ifeq ($(CONFIG_RTE_LIBRTE_POWER), y)
-ifeq ($(shell pkg-config --atleast-version=0.9.3 libvirt; echo $$?), 0)
-DIRS-y += vm_power_manager
-else
-$(info vm_power_manager requires libvirt >= 0.9.3)
-endif
-endif
-
-DIRS-y += eventdev_pipeline
-
-include $(RTE_SDK)/mk/rte.extsubdir.mk
diff --git a/examples/ethtool/Makefile b/examples/ethtool/Makefile
deleted file mode 100644
index d3b97bb50b..0000000000
--- a/examples/ethtool/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2015 Intel Corporation
-
-ifeq ($(RTE_SDK),)
-$(error "Please define RTE_SDK environment variable")
-endif
-
-# Default target, detect a build directory, by looking for a path with a .config
-RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config)))))
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),y)
-$(info This application can only operate in a linux environment, \
-please change the definition of the RTE_TARGET environment variable)
-else
-
-DIRS-y += lib ethtool-app
-endif
-
-DEPDIRS-ethtool-app := lib
-
-include $(RTE_SDK)/mk/rte.extsubdir.mk
diff --git a/examples/ethtool/ethtool-app/Makefile b/examples/ethtool/ethtool-app/Makefile
deleted file mode 100644
index 20ac0d3240..0000000000
--- a/examples/ethtool/ethtool-app/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-ifeq ($(RTE_SDK),)
-$(error "Please define RTE_SDK environment variable")
-endif
-
-# Default target, detect a build directory, by looking for a path with a .config
-RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config)))))
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-# binary name
-APP = ethtool
-
-# all source are stored in SRCS-y
-SRCS-y := main.c ethapp.c
-
-CFLAGS += -O3 -pthread -I$(SRCDIR)/../lib
-CFLAGS += $(WERROR_FLAGS)
-CFLAGS += -DALLOW_EXPERIMENTAL_API
-
-LDLIBS += -L$(subst ethtool-app,lib,$(RTE_OUTPUT))/lib
-LDLIBS += -lrte_ethtool
-
-ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y)
-ifeq ($(CONFIG_RTE_LIBRTE_IXGBE_PMD),y)
-LDLIBS += -lrte_pmd_ixgbe
-endif
-endif
-
-include $(RTE_SDK)/mk/rte.extapp.mk
diff --git a/examples/ethtool/lib/Makefile b/examples/ethtool/lib/Makefile
deleted file mode 100644
index 6494741270..0000000000
--- a/examples/ethtool/lib/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2015 Intel Corporation
-
-ifeq ($(RTE_SDK),)
-$(error "Please define RTE_SDK environment variable")
-endif
-
-# Default target, detect a build directory, by looking for a path with a .config
-RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config)))))
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),y)
-$(error This application can only operate in a linux environment, \
-please change the definition of the RTE_TARGET environment variable)
-endif
-
-# library name
-LIB = librte_ethtool.a
-
-LIBABIVER := 0.1
-
-# all source are stored in SRC-Y
-SRCS-y := rte_ethtool.c
-
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS)
-CFLAGS += -DALLOW_EXPERIMENTAL_API
-
-ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y)
-ifeq ($(CONFIG_RTE_LIBRTE_IXGBE_PMD),y)
-LDLIBS += -lrte_pmd_ixgbe
-endif
-endif
-LDLIBS += -lrte_eal -lrte_ethdev
-
-include $(RTE_SDK)/mk/rte.extlib.mk
diff --git a/examples/l2fwd-keepalive/ka-agent/Makefile b/examples/l2fwd-keepalive/ka-agent/Makefile
deleted file mode 100644
index 8d5061b178..0000000000
--- a/examples/l2fwd-keepalive/ka-agent/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2016 Intel Corporation
-
-ifeq ($(RTE_SDK),)
-$(error "Please define RTE_SDK environment variable")
-endif
-
-# Default target, detect a build directory, by looking for a path with a .config
-RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config)))))
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-# binary name
-APP = ka-agent
-
-# all source are stored in SRCS-y
-SRCS-y := main.c
-
-CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR)/../
-CFLAGS += -DALLOW_EXPERIMENTAL_API
-LDFLAGS += -lrt
-include $(RTE_SDK)/mk/rte.extapp.mk
diff --git a/examples/multi_process/Makefile b/examples/multi_process/Makefile
deleted file mode 100644
index 7f7e68d912..0000000000
--- a/examples/multi_process/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-ifeq ($(RTE_SDK),)
-$(error "Please define RTE_SDK environment variable")
-endif
-
-# Default target, detect a build directory, by looking for a path with a .config
-RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config)))))
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-DIRS-$(CONFIG_RTE_EXEC_ENV_LINUX) += client_server_mp
-DIRS-$(CONFIG_RTE_EXEC_ENV_LINUX) += simple_mp
-DIRS-$(CONFIG_RTE_EXEC_ENV_LINUX) += symmetric_mp
-DIRS-$(CONFIG_RTE_EXEC_ENV_LINUX) += hotplug_mp
-
-include $(RTE_SDK)/mk/rte.extsubdir.mk
diff --git a/examples/multi_process/client_server_mp/Makefile b/examples/multi_process/client_server_mp/Makefile
deleted file mode 100644
index fe7a8af605..0000000000
--- a/examples/multi_process/client_server_mp/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-ifeq ($(RTE_SDK),)
-$(error "Please define RTE_SDK environment variable")
-endif
-
-# Default target, detect a build directory, by looking for a path with a .config
-RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config)))))
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-DIRS-$(CONFIG_RTE_EXEC_ENV_LINUX) += mp_client
-DIRS-$(CONFIG_RTE_EXEC_ENV_LINUX) += mp_server
-
-include $(RTE_SDK)/mk/rte.extsubdir.mk
diff --git a/examples/multi_process/client_server_mp/mp_client/Makefile b/examples/multi_process/client_server_mp/mp_client/Makefile
deleted file mode 100644
index 7c447feba3..0000000000
--- a/examples/multi_process/client_server_mp/mp_client/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-ifeq ($(RTE_SDK),)
-$(error "Please define RTE_SDK environment variable")
-endif
-
-# Default target, can be overridden by command line or environment
-include $(RTE_SDK)/mk/rte.vars.mk
-
-# binary name
-APP = mp_client
-
-# all source are stored in SRCS-y
-SRCS-y := client.c
-
-CFLAGS += $(WERROR_FLAGS) -O3
-CFLAGS += -I$(SRCDIR)/../shared
-CFLAGS += -DALLOW_EXPERIMENTAL_API
-
-include $(RTE_SDK)/mk/rte.extapp.mk
diff --git a/examples/multi_process/client_server_mp/mp_server/Makefile b/examples/multi_process/client_server_mp/mp_server/Makefile
deleted file mode 100644
index 50ebf1d7da..0000000000
--- a/examples/multi_process/client_server_mp/mp_server/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-ifeq ($(RTE_SDK),)
-$(error "Please define RTE_SDK environment variable")
-endif
-
-# Default target, detect a build directory, by looking for a path with a .config
-RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config)))))
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),y)
-$(error This application can only operate in a linux environment, \
-please change the definition of the RTE_TARGET environment variable)
-endif
-
-# binary name
-APP = mp_server
-
-# all source are stored in SRCS-y
-SRCS-y := main.c init.c args.c
-
-INC := $(sort $(wildcard *.h))
-
-CFLAGS += -DALLOW_EXPERIMENTAL_API
-CFLAGS += $(WERROR_FLAGS) -O3
-CFLAGS += -I$(SRCDIR)/../shared
-
-# for newer gcc, e.g. 4.4, no-strict-aliasing may not be necessary
-# and so the next line can be removed in those cases.
-EXTRA_CFLAGS += -fno-strict-aliasing
-
-include $(RTE_SDK)/mk/rte.extapp.mk
diff --git a/examples/multi_process/hotplug_mp/Makefile b/examples/multi_process/hotplug_mp/Makefile
deleted file mode 100644
index 1fd7aa085c..0000000000
--- a/examples/multi_process/hotplug_mp/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2018 Intel Corporation
-
-ifeq ($(RTE_SDK),)
-$(error "Please define RTE_SDK environment variable")
-endif
-
-# Default target, detect a build directory, by looking for a path with a .config
-RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config)))))
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-# binary name
-APP = hotplug_mp
-
-# all source are stored in SRCS-y
-SRCS-y := main.c commands.c
-
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS)
-CFLAGS += -DALLOW_EXPERIMENTAL_API
-
-include $(RTE_SDK)/mk/rte.extapp.mk
diff --git a/examples/multi_process/simple_mp/Makefile b/examples/multi_process/simple_mp/Makefile
deleted file mode 100644
index f88b499bdc..0000000000
--- a/examples/multi_process/simple_mp/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-ifeq ($(RTE_SDK),)
-$(error "Please define RTE_SDK environment variable")
-endif
-
-# Default target, detect a build directory, by looking for a path with a .config
-RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config)))))
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-# binary name
-APP = simple_mp
-
-# all source are stored in SRCS-y
-SRCS-y := main.c mp_commands.c
-
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS)
-CFLAGS += -DALLOW_EXPERIMENTAL_API
-
-include $(RTE_SDK)/mk/rte.extapp.mk
diff --git a/examples/multi_process/symmetric_mp/Makefile b/examples/multi_process/symmetric_mp/Makefile
deleted file mode 100644
index b7544489bb..0000000000
--- a/examples/multi_process/symmetric_mp/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-ifeq ($(RTE_SDK),)
-$(error "Please define RTE_SDK environment variable")
-endif
-
-# Default target, detect a build directory, by looking for a path with a .config
-RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config)))))
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-# binary name
-APP = symmetric_mp
-
-# all source are stored in SRCS-y
-SRCS-y := main.c
-
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS)
-CFLAGS += -DALLOW_EXPERIMENTAL_API
-
-include $(RTE_SDK)/mk/rte.extapp.mk
diff --git a/examples/performance-thread/Makefile b/examples/performance-thread/Makefile
deleted file mode 100644
index 08158914c3..0000000000
--- a/examples/performance-thread/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2015 Intel Corporation
-
-ifeq ($(RTE_SDK),)
-$(error "Please define RTE_SDK environment variable")
-endif
-
-# Default target, detect a build directory, by looking for a path with a .config
-RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config)))))
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-ifeq ($(filter y,$(CONFIG_RTE_ARCH_X86_64) $(CONFIG_RTE_ARCH_ARM64)),)
-$(error This application is only supported for x86_64 and arm64 targets)
-endif
-
-DIRS-y += l3fwd-thread
-DIRS-y += pthread_shim
-
-
-include $(RTE_SDK)/mk/rte.extsubdir.mk
diff --git a/examples/performance-thread/common/common.mk b/examples/performance-thread/common/common.mk
deleted file mode 100644
index 5e2b18a9ff..0000000000
--- a/examples/performance-thread/common/common.mk
+++ /dev/null
@@ -1,21 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2015 Intel Corporation
-
-# list the C files belonging to the lthread subsystem, these are common to all
-# lthread apps. Any makefile including this should set VPATH to include this
-# directory path
-#
-
-MKFILE_PATH=$(abspath $(dir $(lastword $(MAKEFILE_LIST))))
-
-ifeq ($(CONFIG_RTE_ARCH_X86_64),y)
-ARCH_PATH += $(MKFILE_PATH)/arch/x86
-else ifeq ($(CONFIG_RTE_ARCH_ARM64),y)
-ARCH_PATH += $(MKFILE_PATH)/arch/arm64
-endif
-
-VPATH := $(MKFILE_PATH) $(ARCH_PATH)
-
-SRCS-y += lthread.c lthread_sched.c lthread_cond.c lthread_tls.c lthread_mutex.c lthread_diag.c ctx.c
-
-INCLUDES += -I$(MKFILE_PATH) -I$(ARCH_PATH)
diff --git a/examples/performance-thread/l3fwd-thread/Makefile b/examples/performance-thread/l3fwd-thread/Makefile
deleted file mode 100644
index c6cf05a438..0000000000
--- a/examples/performance-thread/l3fwd-thread/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2015 Intel Corporation
-
-ifeq ($(RTE_SDK),)
-$(error "Please define RTE_SDK environment variable")
-endif
-
-# Default target, detect a build directory, by looking for a path with a .config
-RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config)))))
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-# binary name
-APP = l3fwd-thread
-
-# all source are stored in SRCS-y
-SRCS-y := main.c
-
-include $(RTE_SDK)/examples/performance-thread/common/common.mk
-
-CFLAGS += -O3 -g $(USER_FLAGS) $(INCLUDES) $(WERROR_FLAGS)
-CFLAGS += -DALLOW_EXPERIMENTAL_API
-
-include $(RTE_SDK)/mk/rte.extapp.mk
diff --git a/examples/performance-thread/pthread_shim/Makefile b/examples/performance-thread/pthread_shim/Makefile
deleted file mode 100644
index cdadf2cb77..0000000000
--- a/examples/performance-thread/pthread_shim/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2015 Intel Corporation
-
-ifeq ($(RTE_SDK),)
-$(error "Please define RTE_SDK environment variable")
-endif
-
-# Default target, detect a build directory, by looking for a path with a .config
-RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config)))))
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-# binary name
-APP = lthread_pthread_shim
-
-# all source are stored in SRCS-y
-SRCS-y := main.c  pthread_shim.c
-INCLUDES := -I$(RTE_SDK)/$(RTE_TARGET)/include -I$(SRCDIR)
-include $(RTE_SDK)/examples/performance-thread/common/common.mk
-
-CFLAGS += -g -O3 $(USER_FLAGS) $(INCLUDES)
-CFLAGS += $(WERROR_FLAGS)
-CFLAGS += -DALLOW_EXPERIMENTAL_API
-
-LDFLAGS += -lpthread
-
-# workaround for a gcc bug with noreturn attribute
-# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12603
-ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y)
-CFLAGS_main.o += -Wno-return-type
-endif
-
-include $(RTE_SDK)/mk/rte.extapp.mk
diff --git a/examples/server_node_efd/Makefile b/examples/server_node_efd/Makefile
deleted file mode 100644
index cc2ea8b566..0000000000
--- a/examples/server_node_efd/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2016-2017 Intel Corporation
-
-ifeq ($(RTE_SDK),)
-$(error "Please define RTE_SDK environment variable")
-endif
-
-# Default target, detect a build directory, by looking for a path with a .config
-RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config)))))
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-DIRS-$(CONFIG_RTE_EXEC_ENV_LINUX) += server
-DIRS-$(CONFIG_RTE_EXEC_ENV_LINUX) += node
-
-include $(RTE_SDK)/mk/rte.extsubdir.mk
diff --git a/examples/server_node_efd/node/Makefile b/examples/server_node_efd/node/Makefile
deleted file mode 100644
index ecc551e1d6..0000000000
--- a/examples/server_node_efd/node/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2016-2017 Intel Corporation
-
-ifeq ($(RTE_SDK),)
-$(error "Please define RTE_SDK environment variable")
-endif
-
-# Default target, can be overridden by command line or environment
-include $(RTE_SDK)/mk/rte.vars.mk
-
-# binary name
-APP = node
-
-# all source are stored in SRCS-y
-SRCS-y := node.c
-
-CFLAGS += $(WERROR_FLAGS) -O3
-CFLAGS += -I$(SRCDIR)/../shared
-CFLAGS += -DALLOW_EXPERIMENTAL_API
-
-include $(RTE_SDK)/mk/rte.extapp.mk
diff --git a/examples/server_node_efd/server/Makefile b/examples/server_node_efd/server/Makefile
deleted file mode 100644
index acbd12ae23..0000000000
--- a/examples/server_node_efd/server/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2016-2017 Intel Corporation
-
-ifeq ($(RTE_SDK),)
-$(error "Please define RTE_SDK environment variable")
-endif
-
-# Default target, detect a build directory, by looking for a path with a .config
-RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config)))))
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),y)
-$(error This application can only operate in a linux environment, \
-please change the definition of the RTE_TARGET environment variable)
-endif
-
-# binary name
-APP = server
-
-# all source are stored in SRCS-y
-SRCS-y := main.c init.c args.c
-
-INC := $(sort $(wildcard *.h))
-
-CFLAGS += $(WERROR_FLAGS) -O3
-CFLAGS += -I$(SRCDIR)/../shared
-CFLAGS += -DALLOW_EXPERIMENTAL_API
-
-include $(RTE_SDK)/mk/rte.extapp.mk
diff --git a/examples/vm_power_manager/Makefile b/examples/vm_power_manager/Makefile
deleted file mode 100644
index 65c2ad179e..0000000000
--- a/examples/vm_power_manager/Makefile
+++ /dev/null
@@ -1,65 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-ifneq ($(shell pkg-config --atleast-version=0.9.3 libvirt; echo $$?), 0)
-$(error vm_power_manager requires libvirt >= 0.9.3)
-else
-
-ifeq ($(RTE_SDK),)
-$(error "Please define RTE_SDK environment variable")
-endif
-
-# Default target, detect a build directory, by looking for a path with a .config
-RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config)))))
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-# binary name
-APP = vm_power_mgr
-
-# all source are stored in SRCS-y
-SRCS-y := main.c vm_power_cli.c power_manager.c channel_manager.c
-SRCS-y += channel_monitor.c parse.c
-ifeq ($(CONFIG_RTE_ARCH_X86_64),y)
-SRCS-y += oob_monitor_x86.c
-else
-SRCS-y += oob_monitor_nop.c
-endif
-
-CFLAGS += -O3 -I$(RTE_SDK)/lib/librte_power/
-CFLAGS += $(WERROR_FLAGS)
-CFLAGS += -DALLOW_EXPERIMENTAL_API
-
-LDLIBS += -lvirt
-
-JANSSON := $(shell pkg-config --exists jansson; echo $$?)
-ifeq ($(JANSSON), 0)
-LDLIBS += $(shell pkg-config --libs jansson)
-CFLAGS += -DUSE_JANSSON
-endif
-
-ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y)
-
-ifeq ($(CONFIG_RTE_LIBRTE_IXGBE_PMD),y)
-LDLIBS += -lrte_pmd_ixgbe
-endif
-
-ifeq ($(CONFIG_RTE_LIBRTE_I40E_PMD),y)
-LDLIBS += -lrte_pmd_i40e
-endif
-
-ifeq ($(CONFIG_RTE_LIBRTE_BNXT_PMD),y)
-LDLIBS += -lrte_pmd_bnxt
-endif
-
-endif
-
-# workaround for a gcc bug with noreturn attribute
-# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12603
-ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y)
-CFLAGS_main.o += -Wno-return-type
-endif
-
-include $(RTE_SDK)/mk/rte.extapp.mk
-
-endif # libvirt check
diff --git a/examples/vm_power_manager/guest_cli/Makefile b/examples/vm_power_manager/guest_cli/Makefile
deleted file mode 100644
index 67cf081936..0000000000
--- a/examples/vm_power_manager/guest_cli/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-ifeq ($(RTE_SDK),)
-$(error "Please define RTE_SDK environment variable")
-endif
-
-# Default target, detect a build directory, by looking for a path with a .config
-RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config)))))
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-# binary name
-APP = guest_vm_power_mgr
-
-# all source are stored in SRCS-y
-SRCS-y := main.c vm_power_cli_guest.c parse.c
-
-CFLAGS += -O3 -I$(RTE_SDK)/lib/librte_power/
-CFLAGS += $(WERROR_FLAGS)
-CFLAGS += -DALLOW_EXPERIMENTAL_API
-
-# workaround for a gcc bug with noreturn attribute
-# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12603
-ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y)
-CFLAGS_main.o += -Wno-return-type
-endif
-
-include $(RTE_SDK)/mk/rte.extapp.mk
diff --git a/kernel/Makefile b/kernel/Makefile
deleted file mode 100644
index 5d51fd94bb..0000000000
--- a/kernel/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@ 
-# SPDX-License-Identifier: (BSD-3-Clause OR GPL-2.0)
-# Copyright 2017 NXP
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-DIRS-$(CONFIG_RTE_EXEC_ENV_LINUX) += linux
-DIRS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += freebsd
-
-include $(RTE_SDK)/mk/rte.subdir.mk
diff --git a/kernel/freebsd/Makefile b/kernel/freebsd/Makefile
deleted file mode 100644
index 522d3f68ff..0000000000
--- a/kernel/freebsd/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2017 NXP
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-DIRS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += contigmem
-DIRS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += nic_uio
-
-include $(RTE_SDK)/mk/rte.subdir.mk
diff --git a/kernel/freebsd/contigmem/Makefile b/kernel/freebsd/contigmem/Makefile
deleted file mode 100644
index 428a7edee5..0000000000
--- a/kernel/freebsd/contigmem/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-#
-# module name and path
-#
-MODULE = contigmem
-
-#
-# CFLAGS
-#
-MODULE_CFLAGS += -I$(SRCDIR)
-MODULE_CFLAGS += -I$(RTE_OUTPUT)/include
-MODULE_CFLAGS += -Winline -Wall -Werror
-MODULE_CFLAGS += -include $(RTE_OUTPUT)/include/rte_config.h
-
-#
-# all source are stored in SRCS-y
-#
-SRCS-y := contigmem.c
-
-include $(RTE_SDK)/mk/rte.bsdmodule.mk
diff --git a/kernel/freebsd/nic_uio/Makefile b/kernel/freebsd/nic_uio/Makefile
deleted file mode 100644
index 376ef3a3ab..0000000000
--- a/kernel/freebsd/nic_uio/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-#
-# module name and path
-#
-MODULE = nic_uio
-
-#
-# CFLAGS
-#
-MODULE_CFLAGS += -I$(SRCDIR)
-MODULE_CFLAGS += -I$(RTE_OUTPUT)/include
-MODULE_CFLAGS += -Winline -Wall -Werror
-MODULE_CFLAGS += -include $(RTE_OUTPUT)/include/rte_config.h
-
-#
-# all source are stored in SRCS-y
-#
-SRCS-y := nic_uio.c
-
-include $(RTE_SDK)/mk/rte.bsdmodule.mk
diff --git a/kernel/linux/Makefile b/kernel/linux/Makefile
deleted file mode 100644
index c2c45a3e67..0000000000
--- a/kernel/linux/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@ 
-# SPDX-License-Identifier: GPL-2.0
-# Copyright 2017 NXP
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-DIRS-$(CONFIG_RTE_EAL_IGB_UIO) += igb_uio
-DIRS-$(CONFIG_RTE_KNI_KMOD) += kni
-
-include $(RTE_SDK)/mk/rte.subdir.mk
diff --git a/kernel/linux/igb_uio/Makefile b/kernel/linux/igb_uio/Makefile
deleted file mode 100644
index f83bcc7c69..0000000000
--- a/kernel/linux/igb_uio/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-#
-# module name and path
-#
-MODULE = igb_uio
-MODULE_PATH = drivers/net/igb_uio
-
-#
-# CFLAGS
-#
-MODULE_CFLAGS += -I$(SRCDIR) --param max-inline-insns-single=100
-MODULE_CFLAGS += -I$(RTE_OUTPUT)/include
-MODULE_CFLAGS += -Winline -Wall -Werror
-MODULE_CFLAGS += -include $(RTE_OUTPUT)/include/rte_config.h
-
-#
-# all source are stored in SRCS-y
-#
-SRCS-y := igb_uio.c
-
-include $(RTE_SDK)/mk/rte.module.mk
diff --git a/kernel/linux/kni/Makefile b/kernel/linux/kni/Makefile
deleted file mode 100644
index 595bac2612..0000000000
--- a/kernel/linux/kni/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-#
-# module name and path
-#
-MODULE = rte_kni
-
-#
-# CFLAGS
-#
-MODULE_CFLAGS += -I$(SRCDIR) --param max-inline-insns-single=50
-MODULE_CFLAGS += -I$(RTE_OUTPUT)/include
-MODULE_CFLAGS += -include $(RTE_OUTPUT)/include/rte_config.h
-MODULE_CFLAGS += -Wall -Werror
-
--include /etc/lsb-release
-
-ifeq ($(DISTRIB_ID),Ubuntu)
-MODULE_CFLAGS += -DUBUNTU_RELEASE_CODE=$(subst .,,$(DISTRIB_RELEASE))
-UBUNTU_KERNEL_CODE := $(shell echo `grep UTS_RELEASE $(RTE_KERNELDIR)/include/generated/utsrelease.h \
-	 | cut -d '"' -f2 | cut -d- -f1,2 | tr .- ,`,1)
-MODULE_CFLAGS += -D"UBUNTU_KERNEL_CODE=UBUNTU_KERNEL_VERSION($(UBUNTU_KERNEL_CODE))"
-endif
-
-#
-# all source are stored in SRCS-y
-#
-SRCS-y := kni_misc.c
-SRCS-y += kni_net.c
-
-include $(RTE_SDK)/mk/rte.module.mk
diff --git a/lib/Makefile b/lib/Makefile
deleted file mode 100644
index 8f5b68a2d4..0000000000
--- a/lib/Makefile
+++ /dev/null
@@ -1,138 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2017 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-DIRS-$(CONFIG_RTE_LIBRTE_KVARGS) += librte_kvargs
-DIRS-y += librte_telemetry
-DIRS-$(CONFIG_RTE_LIBRTE_EAL) += librte_eal
-DEPDIRS-librte_eal := librte_kvargs librte_telemetry
-DIRS-$(CONFIG_RTE_LIBRTE_PCI) += librte_pci
-DEPDIRS-librte_pci := librte_eal
-DIRS-$(CONFIG_RTE_LIBRTE_RING) += librte_ring
-DEPDIRS-librte_ring := librte_eal
-DIRS-$(CONFIG_RTE_LIBRTE_STACK) += librte_stack
-DEPDIRS-librte_stack := librte_eal
-DIRS-$(CONFIG_RTE_LIBRTE_MEMPOOL) += librte_mempool
-DEPDIRS-librte_mempool := librte_eal librte_ring
-DIRS-$(CONFIG_RTE_LIBRTE_MBUF) += librte_mbuf
-DEPDIRS-librte_mbuf := librte_eal librte_mempool
-DIRS-$(CONFIG_RTE_LIBRTE_TIMER) += librte_timer
-DEPDIRS-librte_timer := librte_eal
-DIRS-$(CONFIG_RTE_LIBRTE_CFGFILE) += librte_cfgfile
-DEPDIRS-librte_cfgfile := librte_eal
-DIRS-$(CONFIG_RTE_LIBRTE_CMDLINE) += librte_cmdline
-DEPDIRS-librte_cmdline := librte_eal librte_net
-DIRS-$(CONFIG_RTE_LIBRTE_ETHER) += librte_ethdev
-DEPDIRS-librte_ethdev := librte_net librte_eal librte_mempool librte_ring
-DEPDIRS-librte_ethdev += librte_mbuf
-DEPDIRS-librte_ethdev += librte_kvargs
-DEPDIRS-librte_ethdev += librte_meter
-DIRS-$(CONFIG_RTE_LIBRTE_BBDEV) += librte_bbdev
-DEPDIRS-librte_bbdev := librte_eal librte_mempool librte_mbuf
-DIRS-$(CONFIG_RTE_LIBRTE_CRYPTODEV) += librte_cryptodev
-DEPDIRS-librte_cryptodev := librte_eal librte_mempool librte_ring librte_mbuf
-DEPDIRS-librte_cryptodev += librte_kvargs
-DIRS-$(CONFIG_RTE_LIBRTE_SECURITY) += librte_security
-DEPDIRS-librte_security := librte_eal librte_mempool librte_ring librte_mbuf
-DEPDIRS-librte_security += librte_ethdev
-DEPDIRS-librte_security += librte_cryptodev
-DIRS-$(CONFIG_RTE_LIBRTE_COMPRESSDEV) += librte_compressdev
-DEPDIRS-librte_compressdev := librte_eal librte_mempool librte_ring librte_mbuf
-DEPDIRS-librte_compressdev += librte_kvargs
-DIRS-$(CONFIG_RTE_LIBRTE_REGEXDEV) += librte_regexdev
-DEPDIRS-librte_regexdev := librte_eal librte_mbuf
-DIRS-$(CONFIG_RTE_LIBRTE_EVENTDEV) += librte_eventdev
-DEPDIRS-librte_eventdev := librte_eal librte_ring librte_ethdev librte_hash \
-                           librte_mempool librte_timer librte_cryptodev
-DIRS-$(CONFIG_RTE_LIBRTE_RAWDEV) += librte_rawdev
-DEPDIRS-librte_rawdev := librte_eal librte_ethdev
-DIRS-$(CONFIG_RTE_LIBRTE_VHOST) += librte_vhost
-DEPDIRS-librte_vhost := librte_eal librte_mempool librte_mbuf librte_ethdev \
-			librte_net librte_hash librte_cryptodev
-DIRS-$(CONFIG_RTE_LIBRTE_HASH) += librte_hash
-DEPDIRS-librte_hash := librte_eal librte_ring
-DIRS-$(CONFIG_RTE_LIBRTE_EFD) += librte_efd
-DEPDIRS-librte_efd := librte_eal librte_ring librte_hash
-DIRS-$(CONFIG_RTE_LIBRTE_RIB) += librte_rib
-DEPDIRS-librte_rib := librte_eal librte_mempool
-DIRS-$(CONFIG_RTE_LIBRTE_FIB) += librte_fib
-DEPDIRS-librte_fib := librte_eal librte_rib
-DIRS-$(CONFIG_RTE_LIBRTE_LPM) += librte_lpm
-DEPDIRS-librte_lpm := librte_eal librte_hash librte_rcu
-DIRS-$(CONFIG_RTE_LIBRTE_ACL) += librte_acl
-DEPDIRS-librte_acl := librte_eal
-DIRS-$(CONFIG_RTE_LIBRTE_MEMBER) += librte_member
-DEPDIRS-librte_member := librte_eal librte_hash
-DIRS-$(CONFIG_RTE_LIBRTE_NET) += librte_net
-DEPDIRS-librte_net := librte_mbuf librte_eal
-DIRS-$(CONFIG_RTE_LIBRTE_IP_FRAG) += librte_ip_frag
-DEPDIRS-librte_ip_frag := librte_eal librte_mempool librte_mbuf librte_ethdev
-DEPDIRS-librte_ip_frag += librte_hash
-DIRS-$(CONFIG_RTE_LIBRTE_GRO) += librte_gro
-DEPDIRS-librte_gro := librte_eal librte_mbuf librte_ethdev librte_net
-DIRS-$(CONFIG_RTE_LIBRTE_JOBSTATS) += librte_jobstats
-DEPDIRS-librte_jobstats := librte_eal
-DIRS-$(CONFIG_RTE_LIBRTE_METRICS) += librte_metrics
-DEPDIRS-librte_metrics := librte_eal librte_ethdev
-ifeq ($(CONFIG_RTE_LIBRTE_TELEMETRY),y)
-DEPDIRS-librte_metrics += librte_telemetry
-endif
-DIRS-$(CONFIG_RTE_LIBRTE_BITRATE) += librte_bitratestats
-DEPDIRS-librte_bitratestats := librte_eal librte_metrics librte_ethdev
-DIRS-$(CONFIG_RTE_LIBRTE_LATENCY_STATS) += librte_latencystats
-DEPDIRS-librte_latencystats := librte_eal librte_metrics librte_ethdev librte_mbuf
-DIRS-$(CONFIG_RTE_LIBRTE_POWER) += librte_power
-DEPDIRS-librte_power := librte_eal librte_timer
-DIRS-$(CONFIG_RTE_LIBRTE_METER) += librte_meter
-DEPDIRS-librte_meter := librte_eal
-DIRS-$(CONFIG_RTE_LIBRTE_FLOW_CLASSIFY) += librte_flow_classify
-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_DISTRIBUTOR) += librte_distributor
-DEPDIRS-librte_distributor := librte_eal librte_mbuf librte_ethdev
-DIRS-$(CONFIG_RTE_LIBRTE_PORT) += librte_port
-DEPDIRS-librte_port := librte_eal librte_mempool librte_mbuf librte_ethdev
-DEPDIRS-librte_port += librte_ip_frag librte_sched librte_eventdev
-ifeq ($(CONFIG_RTE_LIBRTE_KNI),y)
-DEPDIRS-librte_port += librte_kni
-endif
-DIRS-$(CONFIG_RTE_LIBRTE_TABLE) += librte_table
-DEPDIRS-librte_table := librte_eal librte_mempool librte_mbuf
-DEPDIRS-librte_table += librte_port librte_lpm librte_hash
-ifeq ($(CONFIG_RTE_LIBRTE_ACL),y)
-DEPDIRS-librte_table += librte_acl
-endif
-DIRS-$(CONFIG_RTE_LIBRTE_PIPELINE) += librte_pipeline
-DEPDIRS-librte_pipeline := librte_eal librte_mempool librte_mbuf
-DEPDIRS-librte_pipeline += librte_table librte_port
-DIRS-$(CONFIG_RTE_LIBRTE_REORDER) += librte_reorder
-DEPDIRS-librte_reorder := librte_eal librte_mempool librte_mbuf
-DIRS-$(CONFIG_RTE_LIBRTE_PDUMP) += librte_pdump
-DEPDIRS-librte_pdump := librte_eal librte_mempool librte_mbuf librte_ethdev
-DIRS-$(CONFIG_RTE_LIBRTE_GSO) += librte_gso
-DEPDIRS-librte_gso := librte_eal librte_mbuf librte_ethdev librte_net
-DEPDIRS-librte_gso += librte_mempool
-DIRS-$(CONFIG_RTE_LIBRTE_BPF) += librte_bpf
-DEPDIRS-librte_bpf := librte_eal librte_mempool librte_mbuf librte_ethdev
-DIRS-$(CONFIG_RTE_LIBRTE_IPSEC) += librte_ipsec
-DEPDIRS-librte_ipsec := librte_eal librte_mbuf librte_cryptodev librte_security \
-			librte_net librte_hash
-DIRS-$(CONFIG_RTE_LIBRTE_RCU) += librte_rcu
-DEPDIRS-librte_rcu := librte_eal librte_ring
-
-DIRS-$(CONFIG_RTE_LIBRTE_GRAPH) += librte_graph
-DEPDIRS-librte_graph := librte_eal
-
-DIRS-$(CONFIG_RTE_LIBRTE_NODE) += librte_node
-DEPDIRS-librte_node := librte_graph librte_lpm librte_ethdev librte_mbuf
-
-ifeq ($(CONFIG_RTE_EXEC_ENV_LINUX),y)
-DIRS-$(CONFIG_RTE_LIBRTE_KNI) += librte_kni
-endif
-DEPDIRS-librte_kni := librte_eal librte_mempool librte_mbuf librte_ethdev
-DEPDIRS-librte_kni += librte_pci
-
-include $(RTE_SDK)/mk/rte.subdir.mk
diff --git a/lib/librte_acl/Makefile b/lib/librte_acl/Makefile
deleted file mode 100644
index f4332b0448..0000000000
--- a/lib/librte_acl/Makefile
+++ /dev/null
@@ -1,65 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-# library name
-LIB = librte_acl.a
-
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR)
-LDLIBS += -lrte_eal
-
-EXPORT_MAP := rte_acl_version.map
-
-# all source are stored in SRCS-y
-SRCS-$(CONFIG_RTE_LIBRTE_ACL) += tb_mem.c
-
-SRCS-$(CONFIG_RTE_LIBRTE_ACL) += rte_acl.c
-SRCS-$(CONFIG_RTE_LIBRTE_ACL) += acl_bld.c
-SRCS-$(CONFIG_RTE_LIBRTE_ACL) += acl_gen.c
-SRCS-$(CONFIG_RTE_LIBRTE_ACL) += acl_run_scalar.c
-
-ifneq ($(filter y,$(CONFIG_RTE_ARCH_ARM) $(CONFIG_RTE_ARCH_ARM64)),)
-SRCS-$(CONFIG_RTE_LIBRTE_ACL) += acl_run_neon.c
-CFLAGS_acl_run_neon.o += -flax-vector-conversions
-ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y)
-CFLAGS_acl_run_neon.o += -Wno-maybe-uninitialized
-endif
-else ifeq ($(CONFIG_RTE_ARCH_PPC_64),y)
-SRCS-$(CONFIG_RTE_LIBRTE_ACL) += acl_run_altivec.c
-else
-SRCS-$(CONFIG_RTE_LIBRTE_ACL) += acl_run_sse.c
-endif
-
-#
-# If the compiler supports AVX2 instructions,
-# then add support for AVX2 classify method.
-#
-
-#check if flag for AVX2 is already on, if not set it up manually
-ifeq ($(findstring RTE_MACHINE_CPUFLAG_AVX2,$(CFLAGS)),RTE_MACHINE_CPUFLAG_AVX2)
-	CC_AVX2_SUPPORT=1
-else
-	CC_AVX2_SUPPORT=\
-	$(shell $(CC) -march=core-avx2 -dM -E - </dev/null 2>&1 | \
-	grep -q AVX2 && echo 1)
-	ifeq ($(CC_AVX2_SUPPORT), 1)
-		ifeq ($(CONFIG_RTE_TOOLCHAIN_ICC),y)
-		CFLAGS_acl_run_avx2.o += -march=core-avx2
-		else
-		CFLAGS_acl_run_avx2.o += -mavx2
-		endif
-	endif
-endif
-
-ifeq ($(CC_AVX2_SUPPORT), 1)
-	SRCS-$(CONFIG_RTE_LIBRTE_ACL) += acl_run_avx2.c
-	CFLAGS_rte_acl.o += -DCC_AVX2_SUPPORT
-endif
-
-# install this header file
-SYMLINK-$(CONFIG_RTE_LIBRTE_ACL)-include := rte_acl_osdep.h
-SYMLINK-$(CONFIG_RTE_LIBRTE_ACL)-include += rte_acl.h
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/lib/librte_bbdev/Makefile b/lib/librte_bbdev/Makefile
deleted file mode 100644
index 9d7576b358..0000000000
--- a/lib/librte_bbdev/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2017 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-# library name
-LIB = librte_bbdev.a
-
-# build flags
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS)
-LDLIBS += -lrte_eal -lrte_mempool -lrte_mbuf
-
-# library source files
-SRCS-y += rte_bbdev.c
-
-# export include files
-SYMLINK-y-include += rte_bbdev_op.h
-SYMLINK-y-include += rte_bbdev.h
-SYMLINK-y-include += rte_bbdev_pmd.h
-
-# versioning export map
-EXPORT_MAP := rte_bbdev_version.map
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/lib/librte_bitratestats/Makefile b/lib/librte_bitratestats/Makefile
deleted file mode 100644
index 4862c44b83..0000000000
--- a/lib/librte_bitratestats/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2017 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-# library name
-LIB = librte_bitratestats.a
-
-CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3
-LDLIBS += -lrte_eal -lrte_metrics -lrte_ethdev
-
-EXPORT_MAP := rte_bitratestats_version.map
-
-# all source are stored in SRCS-y
-SRCS-$(CONFIG_RTE_LIBRTE_BITRATE) := rte_bitrate.c
-
-# Install header file
-SYMLINK-$(CONFIG_RTE_LIBRTE_BITRATE)-include += rte_bitrate.h
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/lib/librte_bpf/Makefile b/lib/librte_bpf/Makefile
deleted file mode 100644
index 3be6750432..0000000000
--- a/lib/librte_bpf/Makefile
+++ /dev/null
@@ -1,40 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2018 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-# library name
-LIB = librte_bpf.a
-
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR)
-LDLIBS += -lrte_net -lrte_eal
-LDLIBS += -lrte_mempool -lrte_ring
-LDLIBS += -lrte_mbuf -lrte_ethdev
-ifeq ($(CONFIG_RTE_LIBRTE_BPF_ELF),y)
-LDLIBS += -lelf
-endif
-
-EXPORT_MAP := rte_bpf_version.map
-
-# all source are stored in SRCS-y
-SRCS-$(CONFIG_RTE_LIBRTE_BPF) += bpf.c
-SRCS-$(CONFIG_RTE_LIBRTE_BPF) += bpf_exec.c
-SRCS-$(CONFIG_RTE_LIBRTE_BPF) += bpf_load.c
-SRCS-$(CONFIG_RTE_LIBRTE_BPF) += bpf_pkt.c
-SRCS-$(CONFIG_RTE_LIBRTE_BPF) += bpf_validate.c
-ifeq ($(CONFIG_RTE_LIBRTE_BPF_ELF),y)
-SRCS-$(CONFIG_RTE_LIBRTE_BPF) += bpf_load_elf.c
-endif
-ifeq ($(CONFIG_RTE_ARCH_X86_64),y)
-SRCS-$(CONFIG_RTE_LIBRTE_BPF) += bpf_jit_x86.c
-else ifeq ($(CONFIG_RTE_ARCH_ARM64),y)
-SRCS-$(CONFIG_RTE_LIBRTE_BPF) += bpf_jit_arm64.c
-endif
-
-# install header files
-SYMLINK-$(CONFIG_RTE_LIBRTE_BPF)-include += bpf_def.h
-SYMLINK-$(CONFIG_RTE_LIBRTE_BPF)-include += rte_bpf.h
-SYMLINK-$(CONFIG_RTE_LIBRTE_BPF)-include += rte_bpf_ethdev.h
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/lib/librte_cfgfile/Makefile b/lib/librte_cfgfile/Makefile
deleted file mode 100644
index 7c10a4e56c..0000000000
--- a/lib/librte_cfgfile/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-#
-# library name
-#
-LIB = librte_cfgfile.a
-
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS)
-CFLAGS += -I$(SRCDIR)/../librte_eal/include
-LDLIBS += -lrte_eal
-
-EXPORT_MAP := rte_cfgfile_version.map
-
-#
-# all source are stored in SRCS-y
-#
-SRCS-$(CONFIG_RTE_LIBRTE_CFGFILE) += rte_cfgfile.c
-
-# install includes
-SYMLINK-$(CONFIG_RTE_LIBRTE_CFGFILE)-include += rte_cfgfile.h
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/lib/librte_cmdline/Makefile b/lib/librte_cmdline/Makefile
deleted file mode 100644
index 619d9a2426..0000000000
--- a/lib/librte_cmdline/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-# library name
-LIB = librte_cmdline.a
-
-CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3
-
-EXPORT_MAP := rte_cmdline_version.map
-
-# all source are stored in SRCS-y
-SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) := cmdline.c
-SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += cmdline_cirbuf.c
-SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += cmdline_parse.c
-SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += cmdline_parse_etheraddr.c
-SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += cmdline_parse_ipaddr.c
-SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += cmdline_parse_num.c
-SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += cmdline_parse_string.c
-SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += cmdline_rdline.c
-SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += cmdline_vt100.c
-SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += cmdline_socket.c
-SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += cmdline_parse_portlist.c
-
-LDLIBS += -lrte_net -lrte_eal
-
-# install includes
-INCS := cmdline.h cmdline_parse.h cmdline_parse_num.h cmdline_parse_ipaddr.h
-INCS += cmdline_parse_etheraddr.h cmdline_parse_string.h cmdline_rdline.h
-INCS += cmdline_vt100.h cmdline_socket.h cmdline_cirbuf.h cmdline_parse_portlist.h
-SYMLINK-$(CONFIG_RTE_LIBRTE_CMDLINE)-include := $(INCS)
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/lib/librte_compressdev/Makefile b/lib/librte_compressdev/Makefile
deleted file mode 100644
index 53679d69b8..0000000000
--- a/lib/librte_compressdev/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2017-2018 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-# library name
-LIB = librte_compressdev.a
-
-# build flags
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS)
-LDLIBS += -lrte_eal -lrte_mempool -lrte_kvargs
-
-# library source files
-SRCS-y += rte_compressdev.c rte_compressdev_pmd.c rte_comp.c
-
-# export include files
-SYMLINK-y-include += rte_comp.h
-SYMLINK-y-include += rte_compressdev.h
-# export include files (for PMDs)
-SYMLINK-y-include += rte_compressdev_pmd.h
-SYMLINK-y-include += rte_compressdev_internal.h
-
-# versioning export map
-EXPORT_MAP := rte_compressdev_version.map
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/lib/librte_cryptodev/Makefile b/lib/librte_cryptodev/Makefile
deleted file mode 100644
index 73e77a27c6..0000000000
--- a/lib/librte_cryptodev/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2015-2019 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-# library name
-LIB = librte_cryptodev.a
-
-# build flags
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS)
-LDLIBS += -lrte_eal -lrte_mempool -lrte_ring -lrte_mbuf
-LDLIBS += -lrte_kvargs
-
-# library source files
-SRCS-y += rte_cryptodev.c rte_cryptodev_pmd.c cryptodev_trace_points.c
-
-# export include files
-SYMLINK-y-include += rte_crypto.h
-SYMLINK-y-include += rte_crypto_asym.h
-SYMLINK-y-include += rte_crypto_sym.h
-SYMLINK-y-include += rte_cryptodev.h
-SYMLINK-y-include += rte_cryptodev_pmd.h
-SYMLINK-y-include += rte_cryptodev_trace.h
-SYMLINK-y-include += rte_cryptodev_trace_fp.h
-
-# versioning export map
-EXPORT_MAP := rte_cryptodev_version.map
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/lib/librte_distributor/Makefile b/lib/librte_distributor/Makefile
deleted file mode 100644
index fc32fb3a8f..0000000000
--- a/lib/librte_distributor/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-# library name
-LIB = librte_distributor.a
-
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR)
-LDLIBS += -lrte_eal -lrte_mbuf -lrte_ethdev
-
-EXPORT_MAP := rte_distributor_version.map
-
-# all source are stored in SRCS-y
-SRCS-$(CONFIG_RTE_LIBRTE_DISTRIBUTOR) := rte_distributor_single.c
-SRCS-$(CONFIG_RTE_LIBRTE_DISTRIBUTOR) += rte_distributor.c
-ifeq ($(CONFIG_RTE_ARCH_X86),y)
-SRCS-$(CONFIG_RTE_LIBRTE_DISTRIBUTOR) += rte_distributor_match_sse.c
-else
-SRCS-$(CONFIG_RTE_LIBRTE_DISTRIBUTOR) += rte_distributor_match_generic.c
-endif
-
-
-# install this header file
-SYMLINK-$(CONFIG_RTE_LIBRTE_DISTRIBUTOR)-include := rte_distributor.h
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/lib/librte_eal/Makefile b/lib/librte_eal/Makefile
deleted file mode 100644
index 2fda40d230..0000000000
--- a/lib/librte_eal/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-DIRS-y += include
-DIRS-$(CONFIG_RTE_EXEC_ENV_LINUX) += linux
-DEPDIRS-linux := include
-DIRS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += freebsd
-DEPDIRS-freebsd := include
-
-include $(RTE_SDK)/mk/rte.subdir.mk
diff --git a/lib/librte_eal/freebsd/Makefile b/lib/librte_eal/freebsd/Makefile
deleted file mode 100644
index 9a89556742..0000000000
--- a/lib/librte_eal/freebsd/Makefile
+++ /dev/null
@@ -1,104 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2019 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-LIB = librte_eal.a
-
-ARCH_DIR ?= $(RTE_ARCH)
-VPATH += $(RTE_SDK)/lib/librte_eal/$(ARCH_DIR)
-VPATH += $(RTE_SDK)/lib/librte_eal/unix
-VPATH += $(RTE_SDK)/lib/librte_eal/common
-
-CFLAGS += -I$(SRCDIR)/include
-CFLAGS += -I$(RTE_SDK)/lib/librte_eal/common
-CFLAGS += -I$(RTE_SDK)/lib/librte_eal/include
-CFLAGS += $(WERROR_FLAGS) -O3
-
-LDLIBS += -lexecinfo
-LDLIBS += -lpthread
-LDLIBS += -lgcc_s
-LDLIBS += -lrte_kvargs
-LDLIBS += -lrte_telemetry
-
-EXPORT_MAP := ../rte_eal_version.map
-
-# specific to freebsd exec-env
-SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) := eal.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_cpuflags.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_memory.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_hugepage_info.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_thread.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_debug.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_memalloc.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_lcore.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_timer.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_interrupts.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_alarm.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_dev.c
-
-# from common dir
-SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_config.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_lcore.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_timer.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_memzone.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_log.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_launch.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_mcfg.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_memalloc.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_memory.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_tailqs.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_errno.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_cpuflags.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_hypervisor.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_string_fns.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_hexdump.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_debug.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_devargs.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_class.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_bus.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_dev.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_options.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_thread.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_proc.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_fbarray.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_uuid.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_trace.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_trace_ctf.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_trace_points.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_common_trace_utils.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += rte_malloc.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += hotplug_mp.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += malloc_elem.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += malloc_heap.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += malloc_mp.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += rte_keepalive.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += rte_service.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += rte_random.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += rte_reciprocal.c
-
-# from unix dir
-SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_file.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_unix_memory.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_unix_timer.c
-
-# from arch dir
-SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += rte_cpuflags.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += rte_hypervisor.c
-SRCS-$(CONFIG_RTE_ARCH_X86) += rte_spinlock.c
-SRCS-y += rte_cycles.c
-
-CFLAGS_eal_common_cpuflags.o := $(CPUFLAGS_LIST)
-
-# workaround for a gcc bug with noreturn attribute
-# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12603
-ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y)
-CFLAGS_eal_thread.o += -Wno-return-type
-CFLAGS_eal_hpet.o += -Wno-return-type
-endif
-
-INC := rte_os.h
-
-SYMLINK-$(CONFIG_RTE_EXEC_ENV_FREEBSD)-include := $(addprefix include/,$(INC))
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/lib/librte_eal/include/Makefile b/lib/librte_eal/include/Makefile
deleted file mode 100644
index eb99190d10..0000000000
--- a/lib/librte_eal/include/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-SYMLINK-$(CONFIG_RTE_LIBRTE_EAL)-include := \
-	$(sort $(notdir \
-	$(wildcard $(RTE_SDK)/lib/librte_eal/include/*.h)))
-
-SYMLINK-$(CONFIG_RTE_LIBRTE_EAL)-include/generic := \
-	$(sort $(addprefix generic/, $(notdir \
-	$(wildcard $(RTE_SDK)/lib/librte_eal/include/generic/*.h))))
-
-ARCH_DIR ?= $(RTE_ARCH)
-SYMLINK-$(CONFIG_RTE_LIBRTE_EAL)-include += \
-	$(sort $(addprefix ../$(ARCH_DIR)/include/, $(notdir \
-	$(wildcard $(RTE_SDK)/lib/librte_eal/$(ARCH_DIR)/include/*.h))))
-
-include $(RTE_SDK)/mk/rte.install.mk
diff --git a/lib/librte_eal/linux/Makefile b/lib/librte_eal/linux/Makefile
deleted file mode 100644
index 9939b3d147..0000000000
--- a/lib/librte_eal/linux/Makefile
+++ /dev/null
@@ -1,112 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2019 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-LIB = librte_eal.a
-
-ARCH_DIR ?= $(RTE_ARCH)
-VPATH += $(RTE_SDK)/lib/librte_eal/$(ARCH_DIR)
-VPATH += $(RTE_SDK)/lib/librte_eal/unix
-VPATH += $(RTE_SDK)/lib/librte_eal/common
-
-CFLAGS += -I$(SRCDIR)/include
-CFLAGS += -I$(RTE_SDK)/lib/librte_eal/common
-CFLAGS += -I$(RTE_SDK)/lib/librte_eal/include
-CFLAGS += $(WERROR_FLAGS) -O3
-
-LDLIBS += -ldl
-LDLIBS += -lpthread
-LDLIBS += -lgcc_s
-LDLIBS += -lrt
-LDLIBS += -lrte_kvargs
-LDLIBS += -lrte_telemetry
-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
-SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_hugepage_info.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_memory.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_thread.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_log.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_vfio.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_vfio_mp_sync.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_memalloc.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_debug.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_lcore.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_timer.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_interrupts.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_alarm.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_dev.c
-
-# from common dir
-SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_config.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_lcore.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_timer.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_memzone.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_log.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_launch.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_dynmem.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_mcfg.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_memalloc.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_memory.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_tailqs.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_errno.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_cpuflags.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_hypervisor.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_string_fns.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_hexdump.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_debug.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_devargs.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_class.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_bus.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_dev.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_options.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_thread.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_proc.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_fbarray.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_uuid.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_trace.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_trace_ctf.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_trace_points.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_trace_utils.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += rte_malloc.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += hotplug_mp.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += malloc_elem.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += malloc_heap.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += malloc_mp.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += rte_keepalive.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += rte_service.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += rte_random.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += rte_reciprocal.c
-
-# from unix dir
-SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_file.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_unix_memory.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_unix_timer.c
-
-# from arch dir
-SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += rte_cpuflags.c
-SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += rte_hypervisor.c
-SRCS-$(CONFIG_RTE_ARCH_X86) += rte_spinlock.c
-SRCS-y += rte_cycles.c
-
-CFLAGS_eal_common_cpuflags.o := $(CPUFLAGS_LIST)
-
-# workaround for a gcc bug with noreturn attribute
-# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12603
-ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y)
-CFLAGS_eal_thread.o += -Wno-return-type
-endif
-
-INC := rte_kni_common.h
-INC += rte_os.h
-
-SYMLINK-$(CONFIG_RTE_EXEC_ENV_LINUX)-include := $(addprefix include/,$(INC))
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/lib/librte_efd/Makefile b/lib/librte_efd/Makefile
deleted file mode 100644
index 2dc97132e0..0000000000
--- a/lib/librte_efd/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2016-2017 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-# library name
-LIB = librte_efd.a
-
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR)
-LDLIBS += -lrte_eal -lrte_ring -lrte_hash
-
-EXPORT_MAP := rte_efd_version.map
-
-# all source are stored in SRCS-y
-SRCS-$(CONFIG_RTE_LIBRTE_EFD) := rte_efd.c
-
-# install this header file
-SYMLINK-$(CONFIG_RTE_LIBRTE_EFD)-include := rte_efd.h
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/lib/librte_ethdev/Makefile b/lib/librte_ethdev/Makefile
deleted file mode 100644
index 47747150b2..0000000000
--- a/lib/librte_ethdev/Makefile
+++ /dev/null
@@ -1,46 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2017 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-#
-# library name
-#
-LIB = librte_ethdev.a
-
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS)
-LDLIBS += -lrte_net -lrte_eal -lrte_mempool -lrte_ring
-LDLIBS += -lrte_mbuf -lrte_kvargs -lrte_meter -lrte_telemetry
-
-EXPORT_MAP := rte_ethdev_version.map
-
-SRCS-y += ethdev_private.c
-SRCS-y += rte_ethdev.c
-SRCS-y += rte_class_eth.c
-SRCS-y += rte_flow.c
-SRCS-y += rte_tm.c
-SRCS-y += rte_mtr.c
-SRCS-y += ethdev_profile.c
-SRCS-y += ethdev_trace_points.c
-
-#
-# Export include files
-#
-SYMLINK-y-include += rte_ethdev.h
-SYMLINK-y-include += rte_ethdev_driver.h
-SYMLINK-y-include += rte_ethdev_core.h
-SYMLINK-y-include += rte_ethdev_pci.h
-SYMLINK-y-include += rte_ethdev_trace.h
-SYMLINK-y-include += rte_ethdev_trace_fp.h
-SYMLINK-y-include += rte_ethdev_vdev.h
-SYMLINK-y-include += rte_eth_ctrl.h
-SYMLINK-y-include += rte_dev_info.h
-SYMLINK-y-include += rte_flow.h
-SYMLINK-y-include += rte_flow_driver.h
-SYMLINK-y-include += rte_tm.h
-SYMLINK-y-include += rte_tm_driver.h
-SYMLINK-y-include += rte_mtr.h
-SYMLINK-y-include += rte_mtr_driver.h
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/lib/librte_eventdev/Makefile b/lib/librte_eventdev/Makefile
deleted file mode 100644
index 0715256bb4..0000000000
--- a/lib/librte_eventdev/Makefile
+++ /dev/null
@@ -1,47 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2016 Cavium, Inc
-#
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-# library name
-LIB = librte_eventdev.a
-
-# build flags
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS)
-ifeq ($(CONFIG_RTE_EXEC_ENV_LINUX),y)
-CFLAGS += -DLINUX
-else
-CFLAGS += -DBSD
-endif
-LDLIBS += -lrte_eal -lrte_ring -lrte_ethdev -lrte_hash -lrte_mempool -lrte_timer
-LDLIBS += -lrte_mbuf -lrte_cryptodev -lpthread
-
-# library source files
-SRCS-y += rte_eventdev.c
-SRCS-y += rte_event_ring.c
-SRCS-y += eventdev_trace_points.c
-SRCS-y += rte_event_eth_rx_adapter.c
-SRCS-y += rte_event_timer_adapter.c
-SRCS-y += rte_event_crypto_adapter.c
-SRCS-y += rte_event_eth_tx_adapter.c
-
-# export include files
-SYMLINK-y-include += rte_eventdev.h
-SYMLINK-y-include += rte_eventdev_pmd.h
-SYMLINK-y-include += rte_eventdev_pmd_pci.h
-SYMLINK-y-include += rte_eventdev_pmd_vdev.h
-SYMLINK-y-include += rte_eventdev_trace.h
-SYMLINK-y-include += rte_eventdev_trace_fp.h
-SYMLINK-y-include += rte_event_ring.h
-SYMLINK-y-include += rte_event_eth_rx_adapter.h
-SYMLINK-y-include += rte_event_timer_adapter.h
-SYMLINK-y-include += rte_event_timer_adapter_pmd.h
-SYMLINK-y-include += rte_event_crypto_adapter.h
-SYMLINK-y-include += rte_event_eth_tx_adapter.h
-
-# versioning export map
-EXPORT_MAP := rte_eventdev_version.map
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/lib/librte_fib/Makefile b/lib/librte_fib/Makefile
deleted file mode 100644
index 1dd2a495b1..0000000000
--- a/lib/librte_fib/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2018 Vladimir Medvedkin <medvedkinv@gmail.com>
-# Copyright(c) 2019 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-# library name
-LIB = librte_fib.a
-
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR)
-LDLIBS += -lrte_eal -lrte_rib
-
-EXPORT_MAP := rte_fib_version.map
-
-# all source are stored in SRCS-y
-SRCS-$(CONFIG_RTE_LIBRTE_FIB) := rte_fib.c rte_fib6.c dir24_8.c trie.c
-
-# install this header file
-SYMLINK-$(CONFIG_RTE_LIBRTE_FIB)-include := rte_fib.h rte_fib6.h
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/lib/librte_flow_classify/Makefile b/lib/librte_flow_classify/Makefile
deleted file mode 100644
index ca3cae82dd..0000000000
--- a/lib/librte_flow_classify/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2017 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-# library name
-LIB = librte_flow_classify.a
-
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR)
-
-EXPORT_MAP := rte_flow_classify_version.map
-
-LDLIBS += -lrte_eal -lrte_ethdev -lrte_net -lrte_table -lrte_acl
-
-# all source are stored in SRCS-y
-SRCS-$(CONFIG_RTE_LIBRTE_FLOW_CLASSIFY) += rte_flow_classify.c
-SRCS-$(CONFIG_RTE_LIBRTE_FLOW_CLASSIFY) += rte_flow_classify_parse.c
-
-# install this header file
-SYMLINK-$(CONFIG_RTE_LIBRTE_FLOW_CLASSIFY)-include := rte_flow_classify.h
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/lib/librte_graph/Makefile b/lib/librte_graph/Makefile
deleted file mode 100644
index b66279c675..0000000000
--- a/lib/librte_graph/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(C) 2020 Marvell International Ltd.
-#
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-# library name
-LIB = librte_graph.a
-
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS)
-LDLIBS += -lrte_eal
-
-EXPORT_MAP := rte_graph_version.map
-
-# all source are stored in SRCS-y
-SRCS-$(CONFIG_RTE_LIBRTE_GRAPH) += node.c
-SRCS-$(CONFIG_RTE_LIBRTE_GRAPH) += graph.c
-SRCS-$(CONFIG_RTE_LIBRTE_GRAPH) += graph_ops.c
-SRCS-$(CONFIG_RTE_LIBRTE_GRAPH) += graph_debug.c
-SRCS-$(CONFIG_RTE_LIBRTE_GRAPH) += graph_stats.c
-SRCS-$(CONFIG_RTE_LIBRTE_GRAPH) += graph_populate.c
-
-# install header files
-SYMLINK-$(CONFIG_RTE_LIBRTE_GRAPH)-include += rte_graph.h
-SYMLINK-$(CONFIG_RTE_LIBRTE_GRAPH)-include += rte_graph_worker.h
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/lib/librte_gro/Makefile b/lib/librte_gro/Makefile
deleted file mode 100644
index e848687acd..0000000000
--- a/lib/librte_gro/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2017 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-# library name
-LIB = librte_gro.a
-
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR)
-LDLIBS += -lrte_eal -lrte_mbuf -lrte_ethdev -lrte_net
-
-EXPORT_MAP := rte_gro_version.map
-
-# source files
-SRCS-$(CONFIG_RTE_LIBRTE_GRO) += rte_gro.c
-SRCS-$(CONFIG_RTE_LIBRTE_GRO) += gro_tcp4.c
-SRCS-$(CONFIG_RTE_LIBRTE_GRO) += gro_vxlan_tcp4.c
-
-# install this header file
-SYMLINK-$(CONFIG_RTE_LIBRTE_GRO)-include += rte_gro.h
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/lib/librte_gso/Makefile b/lib/librte_gso/Makefile
deleted file mode 100644
index a34846e920..0000000000
--- a/lib/librte_gso/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2017 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-# library name
-LIB = librte_gso.a
-
-CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3
-LDLIBS += -lrte_eal -lrte_mbuf -lrte_ethdev -lrte_net
-LDLIBS += -lrte_mempool
-
-EXPORT_MAP := rte_gso_version.map
-
-#source files
-SRCS-$(CONFIG_RTE_LIBRTE_GSO) += rte_gso.c
-SRCS-$(CONFIG_RTE_LIBRTE_GSO) += gso_common.c
-SRCS-$(CONFIG_RTE_LIBRTE_GSO) += gso_tcp4.c
-SRCS-$(CONFIG_RTE_LIBRTE_GSO) += gso_tunnel_tcp4.c
-SRCS-$(CONFIG_RTE_LIBRTE_GSO) += gso_udp4.c
-
-# install this header file
-SYMLINK-$(CONFIG_RTE_LIBRTE_GSO)-include += rte_gso.h
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/lib/librte_hash/Makefile b/lib/librte_hash/Makefile
deleted file mode 100644
index ec9f864992..0000000000
--- a/lib/librte_hash/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2015 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-# library name
-LIB = librte_hash.a
-
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR)
-LDLIBS += -lrte_eal -lrte_ring
-
-EXPORT_MAP := rte_hash_version.map
-
-# all source are stored in SRCS-y
-SRCS-$(CONFIG_RTE_LIBRTE_HASH) := rte_cuckoo_hash.c
-SRCS-$(CONFIG_RTE_LIBRTE_HASH) += rte_fbk_hash.c
-
-# install this header file
-SYMLINK-$(CONFIG_RTE_LIBRTE_HASH)-include := rte_hash.h
-SYMLINK-$(CONFIG_RTE_LIBRTE_HASH)-include += rte_hash_crc.h
-ifeq ($(CONFIG_RTE_ARCH_ARM64),y)
-ifneq ($(findstring RTE_MACHINE_CPUFLAG_CRC32,$(CFLAGS)),)
-SYMLINK-$(CONFIG_RTE_LIBRTE_HASH)-include += rte_crc_arm64.h
-endif
-endif
-SYMLINK-$(CONFIG_RTE_LIBRTE_HASH)-include += rte_jhash.h
-SYMLINK-$(CONFIG_RTE_LIBRTE_HASH)-include += rte_thash.h
-SYMLINK-$(CONFIG_RTE_LIBRTE_HASH)-include += rte_fbk_hash.h
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/lib/librte_ip_frag/Makefile b/lib/librte_ip_frag/Makefile
deleted file mode 100644
index 6b80d9f1f2..0000000000
--- a/lib/librte_ip_frag/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-# library name
-LIB = librte_ip_frag.a
-
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR)
-LDLIBS += -lrte_eal -lrte_mempool -lrte_mbuf -lrte_ethdev
-LDLIBS += -lrte_hash
-
-EXPORT_MAP := rte_ip_frag_version.map
-
-#source files
-SRCS-$(CONFIG_RTE_LIBRTE_IP_FRAG) += rte_ipv4_fragmentation.c
-SRCS-$(CONFIG_RTE_LIBRTE_IP_FRAG) += rte_ipv6_fragmentation.c
-SRCS-$(CONFIG_RTE_LIBRTE_IP_FRAG) += rte_ipv4_reassembly.c
-SRCS-$(CONFIG_RTE_LIBRTE_IP_FRAG) += rte_ipv6_reassembly.c
-SRCS-$(CONFIG_RTE_LIBRTE_IP_FRAG) += rte_ip_frag_common.c
-SRCS-$(CONFIG_RTE_LIBRTE_IP_FRAG) += ip_frag_internal.c
-
-# install this header file
-SYMLINK-$(CONFIG_RTE_LIBRTE_IP_FRAG)-include += rte_ip_frag.h
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/lib/librte_ipsec/Makefile b/lib/librte_ipsec/Makefile
deleted file mode 100644
index e4c69646b0..0000000000
--- a/lib/librte_ipsec/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2018 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-# library name
-LIB = librte_ipsec.a
-
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR)
-LDLIBS += -lrte_eal -lrte_mempool -lrte_mbuf -lrte_net
-LDLIBS += -lrte_cryptodev -lrte_security -lrte_hash
-
-EXPORT_MAP := rte_ipsec_version.map
-
-# all source are stored in SRCS-y
-SRCS-$(CONFIG_RTE_LIBRTE_IPSEC) += esp_inb.c
-SRCS-$(CONFIG_RTE_LIBRTE_IPSEC) += esp_outb.c
-SRCS-$(CONFIG_RTE_LIBRTE_IPSEC) += sa.c
-SRCS-$(CONFIG_RTE_LIBRTE_IPSEC) += ses.c
-SRCS-$(CONFIG_RTE_LIBRTE_IPSEC) += ipsec_sad.c
-
-# install header files
-SYMLINK-$(CONFIG_RTE_LIBRTE_IPSEC)-include += rte_ipsec.h
-SYMLINK-$(CONFIG_RTE_LIBRTE_IPSEC)-include += rte_ipsec_group.h
-SYMLINK-$(CONFIG_RTE_LIBRTE_IPSEC)-include += rte_ipsec_sa.h
-SYMLINK-$(CONFIG_RTE_LIBRTE_IPSEC)-include += rte_ipsec_sad.h
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/lib/librte_jobstats/Makefile b/lib/librte_jobstats/Makefile
deleted file mode 100644
index b30d046829..0000000000
--- a/lib/librte_jobstats/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2015 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-# library name
-LIB = librte_jobstats.a
-
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR)
-LDLIBS += -lrte_eal
-
-EXPORT_MAP := rte_jobstats_version.map
-
-# all source are stored in SRCS-y
-SRCS-$(CONFIG_RTE_LIBRTE_JOBSTATS) := rte_jobstats.c
-
-# install this header file
-SYMLINK-$(CONFIG_RTE_LIBRTE_JOBSTATS)-include := rte_jobstats.h
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/lib/librte_kni/Makefile b/lib/librte_kni/Makefile
deleted file mode 100644
index 9d440aa135..0000000000
--- a/lib/librte_kni/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-# library name
-LIB = librte_kni.a
-
-CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3 -fno-strict-aliasing
-LDLIBS += -lrte_eal -lrte_mempool -lrte_mbuf -lrte_ethdev
-
-EXPORT_MAP := rte_kni_version.map
-
-# all source are stored in SRCS-y
-SRCS-$(CONFIG_RTE_LIBRTE_KNI) := rte_kni.c
-
-# install includes
-SYMLINK-$(CONFIG_RTE_LIBRTE_KNI)-include := rte_kni.h
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/lib/librte_kvargs/Makefile b/lib/librte_kvargs/Makefile
deleted file mode 100644
index 24b1c3c5b9..0000000000
--- a/lib/librte_kvargs/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2014 6WIND S.A.
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-# library name
-LIB = librte_kvargs.a
-
-CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3
-CFLAGS += -I$(RTE_SDK)/lib/librte_eal/include
-
-EXPORT_MAP := rte_kvargs_version.map
-
-# all source are stored in SRCS-y
-SRCS-$(CONFIG_RTE_LIBRTE_KVARGS) := rte_kvargs.c
-
-# install includes
-INCS := rte_kvargs.h
-SYMLINK-$(CONFIG_RTE_LIBRTE_KVARGS)-include := $(INCS)
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/lib/librte_latencystats/Makefile b/lib/librte_latencystats/Makefile
deleted file mode 100644
index b19e0b1788..0000000000
--- a/lib/librte_latencystats/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2017 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-# library name
-LIB = librte_latencystats.a
-
-CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3
-LDLIBS += -lm
-LDLIBS += -lpthread
-LDLIBS += -lrte_eal -lrte_metrics -lrte_ethdev -lrte_mbuf
-
-EXPORT_MAP := rte_latencystats_version.map
-
-# all source are stored in SRCS-y
-SRCS-$(CONFIG_RTE_LIBRTE_LATENCY_STATS) := rte_latencystats.c
-
-# install this header file
-SYMLINK-$(CONFIG_RTE_LIBRTE_LATENCY_STATS)-include := rte_latencystats.h
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/lib/librte_lpm/Makefile b/lib/librte_lpm/Makefile
deleted file mode 100644
index 6f06c5c034..0000000000
--- a/lib/librte_lpm/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-# library name
-LIB = librte_lpm.a
-
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR)
-LDLIBS += -lrte_eal -lrte_hash -lrte_rcu
-
-EXPORT_MAP := rte_lpm_version.map
-
-# all source are stored in SRCS-y
-SRCS-$(CONFIG_RTE_LIBRTE_LPM) := rte_lpm.c rte_lpm6.c
-
-# install this header file
-SYMLINK-$(CONFIG_RTE_LIBRTE_LPM)-include := rte_lpm.h rte_lpm6.h
-
-ifneq ($(filter y,$(CONFIG_RTE_ARCH_ARM) $(CONFIG_RTE_ARCH_ARM64)),)
-SYMLINK-$(CONFIG_RTE_LIBRTE_LPM)-include += rte_lpm_neon.h
-else ifeq ($(CONFIG_RTE_ARCH_X86),y)
-SYMLINK-$(CONFIG_RTE_LIBRTE_LPM)-include += rte_lpm_sse.h
-else ifeq ($(CONFIG_RTE_ARCH_PPC_64),y)
-SYMLINK-$(CONFIG_RTE_LIBRTE_LPM)-include += rte_lpm_altivec.h
-endif
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/lib/librte_mbuf/Makefile b/lib/librte_mbuf/Makefile
deleted file mode 100644
index 41ea5496e3..0000000000
--- a/lib/librte_mbuf/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-# library name
-LIB = librte_mbuf.a
-
-CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3
-
-LDLIBS += -lrte_eal -lrte_mempool
-
-EXPORT_MAP := rte_mbuf_version.map
-
-# all source are stored in SRCS-y
-SRCS-$(CONFIG_RTE_LIBRTE_MBUF) := rte_mbuf.c rte_mbuf_ptype.c rte_mbuf_pool_ops.c
-SRCS-$(CONFIG_RTE_LIBRTE_MBUF) += rte_mbuf_dyn.c
-
-# install includes
-SYMLINK-$(CONFIG_RTE_LIBRTE_MBUF)-include := rte_mbuf.h
-SYMLINK-$(CONFIG_RTE_LIBRTE_MBUF)-include += rte_mbuf_core.h
-SYMLINK-$(CONFIG_RTE_LIBRTE_MBUF)-include += rte_mbuf_ptype.h
-SYMLINK-$(CONFIG_RTE_LIBRTE_MBUF)-include += rte_mbuf_pool_ops.h
-SYMLINK-$(CONFIG_RTE_LIBRTE_MBUF)-include += rte_mbuf_dyn.h
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/lib/librte_member/Makefile b/lib/librte_member/Makefile
deleted file mode 100644
index ef9e2faeaf..0000000000
--- a/lib/librte_member/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2017 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-# library name
-LIB = librte_member.a
-
-CFLAGS := -I$(SRCDIR) $(CFLAGS)
-CFLAGS += $(WERROR_FLAGS) -O3
-
-LDLIBS += -lm
-LDLIBS += -lrte_eal -lrte_hash
-
-EXPORT_MAP := rte_member_version.map
-
-# all source are stored in SRCS-y
-SRCS-$(CONFIG_RTE_LIBRTE_MEMBER) +=  rte_member.c rte_member_ht.c rte_member_vbf.c
-# install includes
-SYMLINK-$(CONFIG_RTE_LIBRTE_MEMBER)-include := rte_member.h
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/lib/librte_mempool/Makefile b/lib/librte_mempool/Makefile
deleted file mode 100644
index 432d6217ec..0000000000
--- a/lib/librte_mempool/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-# library name
-LIB = librte_mempool.a
-
-CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3
-LDLIBS += -lrte_eal -lrte_ring
-
-EXPORT_MAP := rte_mempool_version.map
-
-# all source are stored in SRCS-y
-SRCS-$(CONFIG_RTE_LIBRTE_MEMPOOL) +=  rte_mempool.c
-SRCS-$(CONFIG_RTE_LIBRTE_MEMPOOL) +=  rte_mempool_ops.c
-SRCS-$(CONFIG_RTE_LIBRTE_MEMPOOL) +=  rte_mempool_ops_default.c
-SRCS-$(CONFIG_RTE_LIBRTE_MEMPOOL) +=  mempool_trace_points.c
-# install includes
-SYMLINK-$(CONFIG_RTE_LIBRTE_MEMPOOL)-include := rte_mempool.h
-SYMLINK-$(CONFIG_RTE_LIBRTE_MEMPOOL)-include += rte_mempool_trace.h
-SYMLINK-$(CONFIG_RTE_LIBRTE_MEMPOOL)-include += rte_mempool_trace_fp.h
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/lib/librte_meter/Makefile b/lib/librte_meter/Makefile
deleted file mode 100644
index 48366e82b0..0000000000
--- a/lib/librte_meter/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-#
-# library name
-#
-LIB = librte_meter.a
-
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS)
-
-LDLIBS += -lm
-LDLIBS += -lrte_eal
-
-EXPORT_MAP := rte_meter_version.map
-
-#
-# all source are stored in SRCS-y
-#
-SRCS-$(CONFIG_RTE_LIBRTE_METER) := rte_meter.c
-
-# install includes
-SYMLINK-$(CONFIG_RTE_LIBRTE_METER)-include := rte_meter.h
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/lib/librte_metrics/Makefile b/lib/librte_metrics/Makefile
deleted file mode 100644
index 1264d3bbb0..0000000000
--- a/lib/librte_metrics/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2017 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-# library name
-LIB = librte_metrics.a
-
-CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3
-LDLIBS += -lrte_eal
-
-EXPORT_MAP := rte_metrics_version.map
-
-# all source are stored in SRCS-y
-SRCS-$(CONFIG_RTE_LIBRTE_METRICS) := rte_metrics.c
-
-ifeq ($(CONFIG_RTE_LIBRTE_TELEMETRY),y)
-SRCS-y += rte_metrics_telemetry.c
-SYMLINK-$(CONFIG_RTE_LIBRTE_METRICS)-include += rte_metrics_telemetry.h
-
-LDLIBS += -lrte_ethdev -lrte_telemetry
-LDLIBS += -ljansson
-
-CFLAGS += -I$(RTE_SDK)/lib/librte_telemetry/
-endif
-
-# Install header file
-SYMLINK-$(CONFIG_RTE_LIBRTE_METRICS)-include += rte_metrics.h
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/lib/librte_net/Makefile b/lib/librte_net/Makefile
deleted file mode 100644
index 9830e771b3..0000000000
--- a/lib/librte_net/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-LIB = librte_net.a
-
-CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3
-LDLIBS += -lrte_mbuf -lrte_eal -lrte_mempool
-
-EXPORT_MAP := rte_net_version.map
-SRCS-$(CONFIG_RTE_LIBRTE_NET) := rte_net.c
-SRCS-$(CONFIG_RTE_LIBRTE_NET) += rte_net_crc.c
-SRCS-$(CONFIG_RTE_LIBRTE_NET) += rte_ether.c
-SRCS-$(CONFIG_RTE_LIBRTE_NET) += rte_arp.c
-
-# install includes
-SYMLINK-$(CONFIG_RTE_LIBRTE_NET)-include := rte_ip.h rte_tcp.h rte_udp.h rte_esp.h
-SYMLINK-$(CONFIG_RTE_LIBRTE_NET)-include += rte_sctp.h rte_icmp.h rte_arp.h
-SYMLINK-$(CONFIG_RTE_LIBRTE_NET)-include += rte_ether.h rte_gre.h rte_net.h
-SYMLINK-$(CONFIG_RTE_LIBRTE_NET)-include += rte_net_crc.h rte_mpls.h rte_higig.h
-SYMLINK-$(CONFIG_RTE_LIBRTE_NET)-include += rte_gtp.h rte_vxlan.h
-SYMLINK-$(CONFIG_RTE_LIBRTE_NET)-include += rte_ecpri.h
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/lib/librte_node/Makefile b/lib/librte_node/Makefile
deleted file mode 100644
index 3ec02104d3..0000000000
--- a/lib/librte_node/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(C) 2020 Marvell International Ltd.
-#
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-# library name
-LIB = librte_node.a
-
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS)
-# Strict-aliasing rules are violated by uint8_t[] to context size casts.
-CFLAGS += -fno-strict-aliasing
-LDLIBS += -lrte_eal -lrte_graph -lrte_mbuf -lrte_lpm -lrte_ethdev -lrte_mempool
-
-EXPORT_MAP := rte_node_version.map
-
-# all source are stored in SRCS-y
-SRCS-$(CONFIG_RTE_LIBRTE_NODE) += null.c
-SRCS-$(CONFIG_RTE_LIBRTE_NODE) += log.c
-SRCS-$(CONFIG_RTE_LIBRTE_NODE) += ethdev_rx.c
-SRCS-$(CONFIG_RTE_LIBRTE_NODE) += ethdev_tx.c
-SRCS-$(CONFIG_RTE_LIBRTE_NODE) += ethdev_ctrl.c
-SRCS-$(CONFIG_RTE_LIBRTE_NODE) += ip4_lookup.c
-SRCS-$(CONFIG_RTE_LIBRTE_NODE) += ip4_rewrite.c
-SRCS-$(CONFIG_RTE_LIBRTE_NODE) += pkt_cls.c
-SRCS-$(CONFIG_RTE_LIBRTE_NODE) += pkt_drop.c
-
-# install header files
-SYMLINK-$(CONFIG_RTE_LIBRTE_NODE)-include += rte_node_ip4_api.h
-SYMLINK-$(CONFIG_RTE_LIBRTE_NODE)-include += rte_node_eth_api.h
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/lib/librte_pci/Makefile b/lib/librte_pci/Makefile
deleted file mode 100644
index 7943f30cab..0000000000
--- a/lib/librte_pci/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2017 6WIND S.A.
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-# library name
-LIB = librte_pci.a
-
-CFLAGS := -I$(SRCDIR) $(CFLAGS)
-CFLAGS += $(WERROR_FLAGS) -O3
-LDLIBS += -lrte_eal
-
-EXPORT_MAP := rte_pci_version.map
-
-SRCS-$(CONFIG_RTE_LIBRTE_PCI) += rte_pci.c
-
-SYMLINK-$(CONFIG_RTE_LIBRTE_PCI)-include += rte_pci.h
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/lib/librte_pdump/Makefile b/lib/librte_pdump/Makefile
deleted file mode 100644
index ece8aaacc1..0000000000
--- a/lib/librte_pdump/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2016-2018 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-# library name
-LIB = librte_pdump.a
-
-CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3
-LDLIBS += -lrte_eal -lrte_mempool -lrte_mbuf -lrte_ethdev
-
-EXPORT_MAP := rte_pdump_version.map
-
-# all source are stored in SRCS-y
-SRCS-$(CONFIG_RTE_LIBRTE_PDUMP) := rte_pdump.c
-
-# install this header file
-SYMLINK-$(CONFIG_RTE_LIBRTE_PDUMP)-include := rte_pdump.h
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/lib/librte_pipeline/Makefile b/lib/librte_pipeline/Makefile
deleted file mode 100644
index cfbbd18282..0000000000
--- a/lib/librte_pipeline/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2016 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-#
-# library name
-#
-LIB = librte_pipeline.a
-
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS)
-LDLIBS += -lrte_eal -lrte_mempool -lrte_mbuf -lrte_table
-LDLIBS += -lrte_port -lrte_meter -lrte_sched -lrte_cryptodev
-
-EXPORT_MAP := rte_pipeline_version.map
-
-#
-# all source are stored in SRCS-y
-#
-SRCS-$(CONFIG_RTE_LIBRTE_PIPELINE) := rte_pipeline.c
-SRCS-$(CONFIG_RTE_LIBRTE_PIPELINE) += rte_port_in_action.c
-SRCS-$(CONFIG_RTE_LIBRTE_PIPELINE) += rte_table_action.c
-
-# install includes
-SYMLINK-$(CONFIG_RTE_LIBRTE_PIPELINE)-include += rte_pipeline.h rte_port_in_action.h rte_table_action.h
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/lib/librte_port/Makefile b/lib/librte_port/Makefile
deleted file mode 100644
index 57d2aedbc5..0000000000
--- a/lib/librte_port/Makefile
+++ /dev/null
@@ -1,59 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2016 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-#
-# library name
-#
-LIB = librte_port.a
-ifeq ($(CONFIG_RTE_PORT_PCAP),y)
-LDLIBS += -lpcap
-endif
-LDLIBS += -lrte_eal -lrte_mempool -lrte_mbuf -lrte_ethdev
-LDLIBS += -lrte_ip_frag -lrte_sched -lrte_cryptodev -lrte_eventdev
-ifeq ($(CONFIG_RTE_LIBRTE_KNI),y)
-LDLIBS += -lrte_kni
-endif
-
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS)
-
-EXPORT_MAP := rte_port_version.map
-
-#
-# all source are stored in SRCS-y
-#
-SRCS-$(CONFIG_RTE_LIBRTE_PORT) += rte_port_ethdev.c
-SRCS-$(CONFIG_RTE_LIBRTE_PORT) += rte_port_ring.c
-ifeq ($(CONFIG_RTE_LIBRTE_IP_FRAG),y)
-SRCS-$(CONFIG_RTE_LIBRTE_PORT) += rte_port_frag.c
-SRCS-$(CONFIG_RTE_LIBRTE_PORT) += rte_port_ras.c
-endif
-SRCS-$(CONFIG_RTE_LIBRTE_PORT) += rte_port_sched.c
-SRCS-$(CONFIG_RTE_LIBRTE_PORT) += rte_port_fd.c
-ifeq ($(CONFIG_RTE_LIBRTE_KNI),y)
-SRCS-$(CONFIG_RTE_LIBRTE_PORT) += rte_port_kni.c
-endif
-SRCS-$(CONFIG_RTE_LIBRTE_PORT) += rte_port_source_sink.c
-SRCS-$(CONFIG_RTE_LIBRTE_PORT) += rte_port_sym_crypto.c
-SRCS-$(CONFIG_RTE_LIBRTE_PORT) += rte_port_eventdev.c
-
-# install includes
-SYMLINK-$(CONFIG_RTE_LIBRTE_PORT)-include += rte_port.h
-SYMLINK-$(CONFIG_RTE_LIBRTE_PORT)-include += rte_port_ethdev.h
-SYMLINK-$(CONFIG_RTE_LIBRTE_PORT)-include += rte_port_ring.h
-ifeq ($(CONFIG_RTE_LIBRTE_IP_FRAG),y)
-SYMLINK-$(CONFIG_RTE_LIBRTE_PORT)-include += rte_port_frag.h
-SYMLINK-$(CONFIG_RTE_LIBRTE_PORT)-include += rte_port_ras.h
-endif
-SYMLINK-$(CONFIG_RTE_LIBRTE_PORT)-include += rte_port_sched.h
-SYMLINK-$(CONFIG_RTE_LIBRTE_PORT)-include += rte_port_fd.h
-ifeq ($(CONFIG_RTE_LIBRTE_KNI),y)
-SYMLINK-$(CONFIG_RTE_LIBRTE_PORT)-include += rte_port_kni.h
-endif
-SYMLINK-$(CONFIG_RTE_LIBRTE_PORT)-include += rte_port_source_sink.h
-SYMLINK-$(CONFIG_RTE_LIBRTE_PORT)-include += rte_port_sym_crypto.h
-SYMLINK-$(CONFIG_RTE_LIBRTE_PORT)-include += rte_port_eventdev.h
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/lib/librte_power/Makefile b/lib/librte_power/Makefile
deleted file mode 100644
index 3b067b615f..0000000000
--- a/lib/librte_power/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-# library name
-LIB = librte_power.a
-
-CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3 -fno-strict-aliasing
-LDLIBS += -lrte_eal -lrte_timer
-
-EXPORT_MAP := rte_power_version.map
-
-# all source are stored in SRCS-y
-SRCS-$(CONFIG_RTE_LIBRTE_POWER) := rte_power.c power_acpi_cpufreq.c
-SRCS-$(CONFIG_RTE_LIBRTE_POWER) += power_kvm_vm.c guest_channel.c
-SRCS-$(CONFIG_RTE_LIBRTE_POWER) += rte_power_empty_poll.c
-SRCS-$(CONFIG_RTE_LIBRTE_POWER) += power_pstate_cpufreq.c
-SRCS-$(CONFIG_RTE_LIBRTE_POWER) += power_common.c
-
-# install this header file
-SYMLINK-$(CONFIG_RTE_LIBRTE_POWER)-include := rte_power.h  rte_power_empty_poll.h
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/lib/librte_rawdev/Makefile b/lib/librte_rawdev/Makefile
deleted file mode 100644
index 99f5d2a471..0000000000
--- a/lib/librte_rawdev/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2017 NXP
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-# library name
-LIB = librte_rawdev.a
-
-# build flags
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS)
-LDLIBS += -lrte_eal -lrte_telemetry
-
-# library source files
-SRCS-y += rte_rawdev.c
-
-# export include files
-SYMLINK-y-include += rte_rawdev.h
-SYMLINK-y-include += rte_rawdev_pmd.h
-
-# versioning export map
-EXPORT_MAP := rte_rawdev_version.map
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/lib/librte_rcu/Makefile b/lib/librte_rcu/Makefile
deleted file mode 100644
index 553bca2ef4..0000000000
--- a/lib/librte_rcu/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2018 Arm Limited
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-# library name
-LIB = librte_rcu.a
-
-CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3
-LDLIBS += -lrte_eal -lrte_ring
-
-EXPORT_MAP := rte_rcu_version.map
-
-# all source are stored in SRCS-y
-SRCS-$(CONFIG_RTE_LIBRTE_RCU) := rte_rcu_qsbr.c
-
-# install includes
-SYMLINK-$(CONFIG_RTE_LIBRTE_RCU)-include := rte_rcu_qsbr.h
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/lib/librte_regexdev/Makefile b/lib/librte_regexdev/Makefile
deleted file mode 100644
index c123fcaf5c..0000000000
--- a/lib/librte_regexdev/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(C) 2019 Marvell International Ltd.
-# Copyright 2020 Mellanox Technologies, Ltd
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-# library name
-LIB = librte_regexdev.a
-
-EXPORT_MAP := rte_regex_version.map
-
-# library version
-LIBABIVER := 1
-
-# build flags
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS)
-LDLIBS += -lrte_eal -lrte_mbuf
-
-# library source files
-# all source are stored in SRCS-y
-SRCS-$(CONFIG_RTE_LIBRTE_REGEXDEV) := rte_regexdev.c
-
-# export include files
-SYMLINK-$(CONFIG_RTE_LIBRTE_REGEXDEV)-include += rte_regexdev.h
-SYMLINK-$(CONFIG_RTE_LIBRTE_REGEXDEV)-include += rte_regexdev_core.h
-SYMLINK-$(CONFIG_RTE_LIBRTE_REGEXDEV)-include += rte_regexdev_driver.h
-
-# versioning export map
-EXPORT_MAP := rte_regexdev_version.map
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/lib/librte_reorder/Makefile b/lib/librte_reorder/Makefile
deleted file mode 100644
index 1914411d52..0000000000
--- a/lib/librte_reorder/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-# library name
-LIB = librte_reorder.a
-
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR)
-LDLIBS += -lrte_eal -lrte_mempool -lrte_mbuf
-
-EXPORT_MAP := rte_reorder_version.map
-
-# all source are stored in SRCS-y
-SRCS-$(CONFIG_RTE_LIBRTE_REORDER) := rte_reorder.c
-
-# install this header file
-SYMLINK-$(CONFIG_RTE_LIBRTE_REORDER)-include := rte_reorder.h
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/lib/librte_rib/Makefile b/lib/librte_rib/Makefile
deleted file mode 100644
index be80ce5d3f..0000000000
--- a/lib/librte_rib/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2018 Vladimir Medvedkin <medvedkinv@gmail.com>
-# Copyright(c) 2019 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-# library name
-LIB = librte_rib.a
-
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR)
-LDLIBS += -lrte_eal -lrte_mempool
-
-EXPORT_MAP := rte_rib_version.map
-
-# all source are stored in SRCS-y
-SRCS-$(CONFIG_RTE_LIBRTE_RIB) := rte_rib.c rte_rib6.c
-
-# install this header file
-SYMLINK-$(CONFIG_RTE_LIBRTE_RIB)-include := rte_rib.h rte_rib6.h
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/lib/librte_ring/Makefile b/lib/librte_ring/Makefile
deleted file mode 100644
index 83a9d0840e..0000000000
--- a/lib/librte_ring/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-# library name
-LIB = librte_ring.a
-
-CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3
-LDLIBS += -lrte_eal
-
-EXPORT_MAP := rte_ring_version.map
-
-# all source are stored in SRCS-y
-SRCS-$(CONFIG_RTE_LIBRTE_RING) := rte_ring.c
-
-# install includes
-SYMLINK-$(CONFIG_RTE_LIBRTE_RING)-include := rte_ring.h \
-					rte_ring_core.h \
-					rte_ring_elem.h \
-					rte_ring_generic.h \
-					rte_ring_c11_mem.h \
-					rte_ring_hts.h \
-					rte_ring_hts_c11_mem.h \
-					rte_ring_peek.h \
-					rte_ring_peek_c11_mem.h \
-					rte_ring_rts.h \
-					rte_ring_rts_c11_mem.h
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/lib/librte_sched/Makefile b/lib/librte_sched/Makefile
deleted file mode 100644
index aee93a1205..0000000000
--- a/lib/librte_sched/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-#
-# library name
-#
-LIB = librte_sched.a
-
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS)
-
-LDLIBS += -lm
-LDLIBS += -lrt
-LDLIBS += -lrte_eal -lrte_mempool -lrte_mbuf -lrte_net
-LDLIBS += -lrte_timer
-
-EXPORT_MAP := rte_sched_version.map
-
-#
-# all source are stored in SRCS-y
-#
-SRCS-$(CONFIG_RTE_LIBRTE_SCHED) += rte_sched.c rte_red.c rte_approx.c
-
-# install includes
-SYMLINK-$(CONFIG_RTE_LIBRTE_SCHED)-include := rte_sched.h rte_sched_common.h rte_red.h rte_approx.h
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/lib/librte_security/Makefile b/lib/librte_security/Makefile
deleted file mode 100644
index 825eaeff8e..0000000000
--- a/lib/librte_security/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2017-2019 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-# library name
-LIB = librte_security.a
-
-# build flags
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS)
-LDLIBS += -lrte_eal -lrte_mempool
-
-# library source files
-SRCS-y += rte_security.c
-
-# export include files
-SYMLINK-y-include += rte_security.h
-SYMLINK-y-include += rte_security_driver.h
-
-# versioning export map
-EXPORT_MAP := rte_security_version.map
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/lib/librte_stack/Makefile b/lib/librte_stack/Makefile
deleted file mode 100644
index 020ef102b5..0000000000
--- a/lib/librte_stack/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2019 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-# library name
-LIB = librte_stack.a
-
-CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3
-LDLIBS += -lrte_eal
-
-EXPORT_MAP := rte_stack_version.map
-
-# all source are stored in SRCS-y
-SRCS-$(CONFIG_RTE_LIBRTE_STACK) := rte_stack.c \
-				   rte_stack_std.c \
-				   rte_stack_lf.c
-
-# install includes
-SYMLINK-$(CONFIG_RTE_LIBRTE_STACK)-include := rte_stack.h \
-					      rte_stack_std.h \
-					      rte_stack_lf.h \
-					      rte_stack_lf_generic.h \
-					      rte_stack_lf_c11.h \
-					      rte_stack_lf_stubs.h
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/lib/librte_table/Makefile b/lib/librte_table/Makefile
deleted file mode 100644
index 6ad8a6b17d..0000000000
--- a/lib/librte_table/Makefile
+++ /dev/null
@@ -1,59 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2016 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-#
-# library name
-#
-LIB = librte_table.a
-
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS)
-LDLIBS += -lrte_eal -lrte_mempool -lrte_mbuf -lrte_port
-LDLIBS += -lrte_lpm -lrte_hash
-ifeq ($(CONFIG_RTE_LIBRTE_ACL),y)
-LDLIBS += -lrte_acl
-endif
-
-EXPORT_MAP := rte_table_version.map
-
-#
-# all source are stored in SRCS-y
-#
-SRCS-$(CONFIG_RTE_LIBRTE_TABLE) += rte_table_lpm.c
-SRCS-$(CONFIG_RTE_LIBRTE_TABLE) += rte_table_lpm_ipv6.c
-ifeq ($(CONFIG_RTE_LIBRTE_ACL),y)
-SRCS-$(CONFIG_RTE_LIBRTE_TABLE) += rte_table_acl.c
-endif
-SRCS-$(CONFIG_RTE_LIBRTE_TABLE) += rte_table_hash_cuckoo.c
-SRCS-$(CONFIG_RTE_LIBRTE_TABLE) += rte_table_hash_key8.c
-SRCS-$(CONFIG_RTE_LIBRTE_TABLE) += rte_table_hash_key16.c
-SRCS-$(CONFIG_RTE_LIBRTE_TABLE) += rte_table_hash_key32.c
-SRCS-$(CONFIG_RTE_LIBRTE_TABLE) += rte_table_hash_ext.c
-SRCS-$(CONFIG_RTE_LIBRTE_TABLE) += rte_table_hash_lru.c
-SRCS-$(CONFIG_RTE_LIBRTE_TABLE) += rte_table_array.c
-SRCS-$(CONFIG_RTE_LIBRTE_TABLE) += rte_table_stub.c
-
-# install includes
-SYMLINK-$(CONFIG_RTE_LIBRTE_TABLE)-include += rte_table.h
-SYMLINK-$(CONFIG_RTE_LIBRTE_TABLE)-include += rte_table_lpm.h
-SYMLINK-$(CONFIG_RTE_LIBRTE_TABLE)-include += rte_table_lpm_ipv6.h
-ifeq ($(CONFIG_RTE_LIBRTE_ACL),y)
-SYMLINK-$(CONFIG_RTE_LIBRTE_TABLE)-include += rte_table_acl.h
-endif
-SYMLINK-$(CONFIG_RTE_LIBRTE_TABLE)-include += rte_table_hash.h
-SYMLINK-$(CONFIG_RTE_LIBRTE_TABLE)-include += rte_table_hash_cuckoo.h
-SYMLINK-$(CONFIG_RTE_LIBRTE_TABLE)-include += rte_table_hash_func.h
-SYMLINK-$(CONFIG_RTE_LIBRTE_TABLE)-include += rte_table_hash_func_arm64.h
-SYMLINK-$(CONFIG_RTE_LIBRTE_TABLE)-include += rte_lru.h
-ifeq ($(CONFIG_RTE_ARCH_X86),y)
-SYMLINK-$(CONFIG_RTE_LIBRTE_TABLE)-include += rte_lru_x86.h
-endif
-ifeq ($(CONFIG_RTE_ARCH_ARM64),y)
-SYMLINK-$(CONFIG_RTE_LIBRTE_TABLE)-include += rte_lru_arm64.h
-endif
-SYMLINK-$(CONFIG_RTE_LIBRTE_TABLE)-include += rte_table_array.h
-SYMLINK-$(CONFIG_RTE_LIBRTE_TABLE)-include += rte_table_stub.h
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/lib/librte_telemetry/Makefile b/lib/librte_telemetry/Makefile
deleted file mode 100644
index c62cbd86dc..0000000000
--- a/lib/librte_telemetry/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2018 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-# library name
-LIB = librte_telemetry.a
-
-ARCH_DIR ?= $(RTE_ARCH)
-
-CFLAGS += -O3
-CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR)
-CFLAGS += -I$(RTE_SDK)/lib/librte_metrics/
-CFLAGS += -I$(RTE_SDK)/lib/librte_eal/include
-CFLAGS += -I$(RTE_SDK)/lib/librte_eal/$(ARCH_DIR)/include
-CFLAGS += -pthread
-
-LDLIBS += -lpthread
-
-EXPORT_MAP := rte_telemetry_version.map
-
-# library source files
-SRCS-y += telemetry.c
-SRCS-y += telemetry_data.c
-SRCS-y += telemetry_legacy.c
-
-# export include files
-SYMLINK-y-include := rte_telemetry.h
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/lib/librte_timer/Makefile b/lib/librte_timer/Makefile
deleted file mode 100644
index 7e95d120c0..0000000000
--- a/lib/librte_timer/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-# library name
-LIB = librte_timer.a
-
-CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3
-LDLIBS += -lrte_eal
-
-EXPORT_MAP := rte_timer_version.map
-
-# all source are stored in SRCS-y
-SRCS-$(CONFIG_RTE_LIBRTE_TIMER) := rte_timer.c
-
-# install this header file
-SYMLINK-$(CONFIG_RTE_LIBRTE_TIMER)-include := rte_timer.h
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/lib/librte_vhost/Makefile b/lib/librte_vhost/Makefile
deleted file mode 100644
index 4f2f3e47da..0000000000
--- a/lib/librte_vhost/Makefile
+++ /dev/null
@@ -1,54 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-# library name
-LIB = librte_vhost.a
-
-EXPORT_MAP := rte_vhost_version.map
-
-CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3
-CFLAGS += -I vhost_user
-CFLAGS += -fno-strict-aliasing
-LDLIBS += -lpthread
-
-ifeq ($(RTE_TOOLCHAIN), gcc)
-ifeq ($(shell test $(GCC_VERSION) -ge 83 && echo 1), 1)
-CFLAGS += -DVHOST_GCC_UNROLL_PRAGMA
-endif
-endif
-
-ifeq ($(RTE_TOOLCHAIN), clang)
-ifeq ($(shell test $(CLANG_MAJOR_VERSION)$(CLANG_MINOR_VERSION) -ge 37 && echo 1), 1)
-CFLAGS += -DVHOST_CLANG_UNROLL_PRAGMA
-endif
-endif
-
-ifeq ($(RTE_TOOLCHAIN), icc)
-ifeq ($(shell test $(ICC_MAJOR_VERSION) -ge 16 && echo 1), 1)
-CFLAGS += -DVHOST_ICC_UNROLL_PRAGMA
-endif
-endif
-
-ifeq ($(CONFIG_RTE_LIBRTE_VHOST_NUMA),y)
-LDLIBS += -lnuma
-endif
-LDLIBS += -lrte_eal -lrte_mempool -lrte_mbuf -lrte_ethdev -lrte_net
-
-# all source are stored in SRCS-y
-SRCS-$(CONFIG_RTE_LIBRTE_VHOST) := fd_man.c iotlb.c socket.c vhost.c \
-					vhost_user.c virtio_net.c vdpa.c
-
-# install includes
-SYMLINK-$(CONFIG_RTE_LIBRTE_VHOST)-include += rte_vhost.h rte_vdpa.h \
-						rte_vdpa_dev.h rte_vhost_async.h
-
-# only compile vhost crypto when cryptodev is enabled
-ifeq ($(CONFIG_RTE_LIBRTE_CRYPTODEV),y)
-LDLIBS += -lrte_cryptodev -lrte_hash
-SRCS-$(CONFIG_RTE_LIBRTE_VHOST) += vhost_crypto.c
-SYMLINK-$(CONFIG_RTE_LIBRTE_VHOST)-include += rte_vhost_crypto.h
-endif
-
-include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/mk/arch/arm/rte.vars.mk b/mk/arch/arm/rte.vars.mk
deleted file mode 100644
index dc8c10a24c..0000000000
--- a/mk/arch/arm/rte.vars.mk
+++ /dev/null
@@ -1,16 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright (C) 2015 RehiveTech. All rights reserved.
-
-ARCH  ?= arm
-CROSS ?=
-
-CPU_CFLAGS  ?= -marm -munaligned-access -D_FILE_OFFSET_BITS=64
-CPU_LDFLAGS ?=
-CPU_ASFLAGS ?= -felf
-
-export ARCH CROSS CPU_CFLAGS CPU_LDFLAGS CPU_ASFLAGS
-
-RTE_OBJCOPY_TARGET = elf32-littlearm
-RTE_OBJCOPY_ARCH = arm
-
-export RTE_OBJCOPY_TARGET RTE_OBJCOPY_ARCH
diff --git a/mk/arch/arm64/rte.vars.mk b/mk/arch/arm64/rte.vars.mk
deleted file mode 100644
index a75b80c222..0000000000
--- a/mk/arch/arm64/rte.vars.mk
+++ /dev/null
@@ -1,37 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2015 Cavium, Inc
-#
-
-#
-# arch:
-#
-#   - define ARCH variable (overridden by cmdline or by previous
-#     optional define in machine .mk)
-#   - define CROSS variable (overridden by cmdline or previous define
-#     in machine .mk)
-#   - define CPU_CFLAGS variable (overridden by cmdline or previous
-#     define in machine .mk)
-#   - define CPU_LDFLAGS variable (overridden by cmdline or previous
-#     define in machine .mk)
-#   - define CPU_ASFLAGS variable (overridden by cmdline or previous
-#     define in machine .mk)
-#   - may override any previously defined variable
-#
-# examples for CONFIG_RTE_ARCH: i686, x86_64, x86_64_32
-#
-
-ARCH  ?= arm64
-# common arch dir in eal headers
-ARCH_DIR := arm
-CROSS ?=
-
-CPU_CFLAGS  ?=
-CPU_LDFLAGS ?=
-CPU_ASFLAGS ?= -felf
-
-export ARCH CROSS CPU_CFLAGS CPU_LDFLAGS CPU_ASFLAGS
-
-RTE_OBJCOPY_TARGET = elf64-littleaarch64
-RTE_OBJCOPY_ARCH = aarch64
-
-export RTE_OBJCOPY_TARGET RTE_OBJCOPY_ARCH
diff --git a/mk/arch/i686/rte.vars.mk b/mk/arch/i686/rte.vars.mk
deleted file mode 100644
index c867883f15..0000000000
--- a/mk/arch/i686/rte.vars.mk
+++ /dev/null
@@ -1,36 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-#
-# arch:
-#
-#   - define ARCH variable (overridden by cmdline or by previous
-#     optional define in machine .mk)
-#   - define CROSS variable (overridden by cmdline or previous define
-#     in machine .mk)
-#   - define CPU_CFLAGS variable (overridden by cmdline or previous
-#     define in machine .mk)
-#   - define CPU_LDFLAGS variable (overridden by cmdline or previous
-#     define in machine .mk)
-#   - define CPU_ASFLAGS variable (overridden by cmdline or previous
-#     define in machine .mk)
-#   - may override any previously defined variable
-#
-# examples for CONFIG_RTE_ARCH: i686, x86_64, x86_64_32
-#
-
-ARCH  ?= i386
-# common arch dir in eal headers
-ARCH_DIR := x86
-CROSS ?=
-
-CPU_CFLAGS  ?= -m32 -D_FILE_OFFSET_BITS=64
-CPU_LDFLAGS ?= -melf_i386
-CPU_ASFLAGS ?= -felf
-
-export ARCH CROSS CPU_CFLAGS CPU_LDFLAGS CPU_ASFLAGS
-
-RTE_OBJCOPY_TARGET = elf32-i386
-RTE_OBJCOPY_ARCH = i386
-
-export RTE_OBJCOPY_TARGET RTE_OBJCOPY_ARCH
diff --git a/mk/arch/ppc_64/rte.vars.mk b/mk/arch/ppc_64/rte.vars.mk
deleted file mode 100644
index 9f7ab22f42..0000000000
--- a/mk/arch/ppc_64/rte.vars.mk
+++ /dev/null
@@ -1,17 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright (C) IBM Corporation 2014.
-
-ARCH  ?= powerpc
-ARCH_DIR := ppc
-CROSS ?=
-
-CPU_CFLAGS  ?= -m64
-CPU_LDFLAGS ?=
-CPU_ASFLAGS ?= -felf64
-
-export ARCH CROSS CPU_CFLAGS CPU_LDFLAGS CPU_ASFLAGS
-
-RTE_OBJCOPY_TARGET = elf64-powerpcle
-RTE_OBJCOPY_ARCH = powerpc:common64
-
-export RTE_OBJCOPY_TARGET RTE_OBJCOPY_ARCH
diff --git a/mk/arch/x86_64/rte.vars.mk b/mk/arch/x86_64/rte.vars.mk
deleted file mode 100644
index e1689be9b4..0000000000
--- a/mk/arch/x86_64/rte.vars.mk
+++ /dev/null
@@ -1,36 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-#
-# arch:
-#
-#   - define ARCH variable (overridden by cmdline or by previous
-#     optional define in machine .mk)
-#   - define CROSS variable (overridden by cmdline or previous define
-#     in machine .mk)
-#   - define CPU_CFLAGS variable (overridden by cmdline or previous
-#     define in machine .mk)
-#   - define CPU_LDFLAGS variable (overridden by cmdline or previous
-#     define in machine .mk)
-#   - define CPU_ASFLAGS variable (overridden by cmdline or previous
-#     define in machine .mk)
-#   - may override any previously defined variable
-#
-# examples for CONFIG_RTE_ARCH: i686, x86_64, x86_64_32
-#
-
-ARCH  ?= x86_64
-# common arch dir in eal headers
-ARCH_DIR := x86
-CROSS ?=
-
-CPU_CFLAGS  ?= -m64
-CPU_LDFLAGS ?=
-CPU_ASFLAGS ?= -felf64
-
-export ARCH CROSS CPU_CFLAGS CPU_LDFLAGS CPU_ASFLAGS
-
-RTE_OBJCOPY_TARGET = elf64-x86-64
-RTE_OBJCOPY_ARCH = i386:x86-64
-
-export RTE_OBJCOPY_TARGET RTE_OBJCOPY_ARCH
diff --git a/mk/arch/x86_x32/rte.vars.mk b/mk/arch/x86_x32/rte.vars.mk
deleted file mode 100644
index c59b37a2c8..0000000000
--- a/mk/arch/x86_x32/rte.vars.mk
+++ /dev/null
@@ -1,40 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-#
-# arch:
-#
-#   - define ARCH variable (overridden by cmdline or by previous
-#     optional define in machine .mk)
-#   - define CROSS variable (overridden by cmdline or previous define
-#     in machine .mk)
-#   - define CPU_CFLAGS variable (overridden by cmdline or previous
-#     define in machine .mk)
-#   - define CPU_LDFLAGS variable (overridden by cmdline or previous
-#     define in machine .mk)
-#   - define CPU_ASFLAGS variable (overridden by cmdline or previous
-#     define in machine .mk)
-#   - may override any previously defined variable
-#
-# examples for CONFIG_RTE_ARCH: i686, x86_64, x86_64_32
-#
-
-ARCH  ?= x86_64
-ARCH_DIR := x86
-CROSS ?=
-
-CPU_CFLAGS  ?= -mx32
-CPU_LDFLAGS ?= -melf32_x86_64
-#CPU_ASFLAGS ?= -felf64
-# x32 is supported by Linux distribution with gcc4.8 and newer in some
-# cases there is backported support in gcc4.6
-ifneq ($(shell echo | $(CC) $(CPU_CFLAGS) -E - 2>/dev/null 1>/dev/null && echo 0), 0)
-	$(error This version of GCC does not support x32 ABI)
-endif
-
-export ARCH CROSS CPU_CFLAGS CPU_LDFLAGS CPU_ASFLAGS
-
-RTE_OBJCOPY_TARGET = elf32-x86-64
-RTE_OBJCOPY_ARCH = i386:x86-64
-
-export RTE_OBJCOPY_TARGET RTE_OBJCOPY_ARCH
diff --git a/mk/exec-env/bsdapp b/mk/exec-env/bsdapp
deleted file mode 120000
index 69f5cba2c2..0000000000
--- a/mk/exec-env/bsdapp
+++ /dev/null
@@ -1 +0,0 @@ 
-freebsd/
\ No newline at end of file
diff --git a/mk/exec-env/freebsd/rte.app.mk b/mk/exec-env/freebsd/rte.app.mk
deleted file mode 100644
index a2af7266a6..0000000000
--- a/mk/exec-env/freebsd/rte.app.mk
+++ /dev/null
@@ -1,8 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-exec-env-appinstall:
-	@true
-
-exec-env-appclean:
-	@true
diff --git a/mk/exec-env/freebsd/rte.vars.mk b/mk/exec-env/freebsd/rte.vars.mk
deleted file mode 100644
index 630eb55f73..0000000000
--- a/mk/exec-env/freebsd/rte.vars.mk
+++ /dev/null
@@ -1,36 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2019 Intel Corporation
-
-#
-# exec-env:
-#
-#   - define EXECENV_CFLAGS variable (overridden by cmdline)
-#   - define EXECENV_LDFLAGS variable (overridden by cmdline)
-#   - define EXECENV_ASFLAGS variable (overridden by cmdline)
-#   - may override any previously defined variable
-#
-# examples for RTE_EXEC_ENV: linux, freebsd
-#
-ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y)
-EXECENV_CFLAGS  = -pthread -fPIC
-else
-EXECENV_CFLAGS  = -pthread
-endif
-
-# include in every library to build
-EXECENV_CFLAGS += -I$(RTE_SDK)/lib/librte_eal/freebsd/include
-
-EXECENV_LDFLAGS =
-EXECENV_LDLIBS  = -lexecinfo
-EXECENV_ASFLAGS =
-
-ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y)
-EXECENV_LDLIBS += -lgcc_s
-endif
-
-# force applications to link with gcc/icc instead of using ld
-LINK_USING_CC := 1
-
-BSDMAKE=/usr/bin/make
-
-export EXECENV_CFLAGS EXECENV_LDFLAGS EXECENV_ASFLAGS
diff --git a/mk/exec-env/linux/rte.app.mk b/mk/exec-env/linux/rte.app.mk
deleted file mode 100644
index a2af7266a6..0000000000
--- a/mk/exec-env/linux/rte.app.mk
+++ /dev/null
@@ -1,8 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-exec-env-appinstall:
-	@true
-
-exec-env-appclean:
-	@true
diff --git a/mk/exec-env/linux/rte.vars.mk b/mk/exec-env/linux/rte.vars.mk
deleted file mode 100644
index 41ef4195b0..0000000000
--- a/mk/exec-env/linux/rte.vars.mk
+++ /dev/null
@@ -1,44 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2019 Intel Corporation
-
-#
-# exec-env:
-#
-#   - define EXECENV_CFLAGS variable (overridden by cmdline)
-#   - define EXECENV_LDFLAGS variable (overridden by cmdline)
-#   - define EXECENV_ASFLAGS variable (overridden by cmdline)
-#   - may override any previously defined variable
-#
-# examples for RTE_EXEC_ENV: linux, freebsd
-#
-ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y)
-EXECENV_CFLAGS  = -pthread -fPIC
-else
-EXECENV_CFLAGS  = -pthread
-endif
-
-# include in every library to build
-EXECENV_CFLAGS += -I$(RTE_SDK)/lib/librte_eal/linux/include
-
-EXECENV_LDLIBS  =
-EXECENV_ASFLAGS =
-
-ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y)
-EXECENV_LDLIBS += -lgcc_s
-endif
-
-EXECENV_LDLIBS-$(CONFIG_RTE_USE_LIBBSD) += -lbsd
-
-# force applications to link with gcc/icc instead of using ld
-LINK_USING_CC := 1
-
-# For shared libraries
-EXECENV_LDFLAGS += -export-dynamic
-# Add library to the group to resolve symbols
-EXECENV_LDLIBS  += -ldl
-
-# EXECENV_LDLIBS-y applies to lib.so and app linking
-# while EXECENV_LDLIBS applies only to app linking.
-EXECENV_LDLIBS += $(EXECENV_LDLIBS-y)
-
-export EXECENV_CFLAGS EXECENV_LDFLAGS EXECENV_ASFLAGS EXECENV_LDLIBS
diff --git a/mk/exec-env/linuxapp b/mk/exec-env/linuxapp
deleted file mode 120000
index ce5e2c77b2..0000000000
--- a/mk/exec-env/linuxapp
+++ /dev/null
@@ -1 +0,0 @@ 
-linux/
\ No newline at end of file
diff --git a/mk/internal/rte.build-post.mk b/mk/internal/rte.build-post.mk
deleted file mode 100644
index a6b6a9a46a..0000000000
--- a/mk/internal/rte.build-post.mk
+++ /dev/null
@@ -1,34 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-# build helper .mk
-
-# fast way, no need to do prebuild and postbuild
-ifeq ($(PREBUILD)$(POSTBUILD),)
-
-_postbuild: $(_BUILD)
-	@touch _postbuild
-
-else # slower way
-
-_prebuild: $(PREBUILD)
-	@touch _prebuild
-
-ifneq ($(_BUILD),)
-$(_BUILD): _prebuild
-else
-_BUILD = _prebuild
-endif
-
-_build: $(_BUILD)
-	@touch _build
-
-ifneq ($(POSTBUILD),)
-$(POSTBUILD): _build
-else
-POSTBUILD = _build
-endif
-
-_postbuild: $(POSTBUILD)
-	@touch _postbuild
-endif
\ No newline at end of file
diff --git a/mk/internal/rte.build-pre.mk b/mk/internal/rte.build-pre.mk
deleted file mode 100644
index 137612f19b..0000000000
--- a/mk/internal/rte.build-pre.mk
+++ /dev/null
@@ -1,7 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-_BUILD_TARGETS := _prebuild _build _postbuild
-
-comma := ,
-linkerprefix = $(subst -Wl$(comma)-L,-L,$(addprefix -Wl$(comma),$1))
diff --git a/mk/internal/rte.clean-post.mk b/mk/internal/rte.clean-post.mk
deleted file mode 100644
index 77685edd99..0000000000
--- a/mk/internal/rte.clean-post.mk
+++ /dev/null
@@ -1,34 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-# clean helper .mk
-
-# fast way, no need to do preclean and postclean
-ifeq ($(PRECLEAN)$(POSTCLEAN),)
-
-_postclean: $(_CLEAN)
-	@touch _postclean
-
-else # slower way
-
-_preclean: $(PRECLEAN)
-	@touch _preclean
-
-ifneq ($(_CLEAN),)
-$(_CLEAN): _preclean
-else
-_CLEAN = _preclean
-endif
-
-_clean: $(_CLEAN)
-	@touch _clean
-
-ifneq ($(POSTCLEAN),)
-$(POSTCLEAN): _clean
-else
-POSTCLEAN = _clean
-endif
-
-_postclean: $(POSTCLEAN)
-	@touch _postclean
-endif
diff --git a/mk/internal/rte.clean-pre.mk b/mk/internal/rte.clean-pre.mk
deleted file mode 100644
index e21607bff9..0000000000
--- a/mk/internal/rte.clean-pre.mk
+++ /dev/null
@@ -1,4 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-_CLEAN_TARGETS := _preclean _clean _postclean
diff --git a/mk/internal/rte.compile-post.mk b/mk/internal/rte.compile-post.mk
deleted file mode 100644
index 01525bee1b..0000000000
--- a/mk/internal/rte.compile-post.mk
+++ /dev/null
@@ -1,5 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-# no rule no build these files
-$(DEPS-y) $(CMDS-y):
diff --git a/mk/internal/rte.compile-pre.mk b/mk/internal/rte.compile-pre.mk
deleted file mode 100644
index df05b55769..0000000000
--- a/mk/internal/rte.compile-pre.mk
+++ /dev/null
@@ -1,164 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-#
-# Common to rte.lib.mk, rte.app.mk, rte.obj.mk
-#
-
-SRCS-all := $(SRCS-y) $(SRCS-n) $(SRCS-)
-
-# convert source to obj file
-src2obj = $(strip $(patsubst %.c,%.o,\
-	$(patsubst %.S,%_s.o,$(1))))
-
-# add a dot in front of the file name
-dotfile = $(strip $(foreach f,$(1),\
-	$(join $(dir $f),.$(notdir $f))))
-
-# convert source/obj files into dot-dep filename (does not
-# include .S files)
-src2dep = $(strip $(call dotfile,$(patsubst %.c,%.o.d, \
-		$(patsubst %.S,,$(1)))))
-obj2dep = $(strip $(call dotfile,$(patsubst %.o,%.o.d,$(1))))
-
-# convert source/obj files into dot-cmd filename
-src2cmd = $(strip $(call dotfile,$(patsubst %.c,%.o.cmd, \
-		$(patsubst %.S,%_s.o.cmd,$(1)))))
-obj2cmd = $(strip $(call dotfile,$(patsubst %.o,%.o.cmd,$(1))))
-
-OBJS-y := $(call src2obj,$(SRCS-y))
-OBJS-n := $(call src2obj,$(SRCS-n))
-OBJS-  := $(call src2obj,$(SRCS-))
-OBJS-all := $(filter-out $(SRCS-all),$(OBJS-y) $(OBJS-n) $(OBJS-))
-
-DEPS-y := $(call src2dep,$(SRCS-y))
-DEPS-n := $(call src2dep,$(SRCS-n))
-DEPS-  := $(call src2dep,$(SRCS-))
-DEPS-all := $(DEPS-y) $(DEPS-n) $(DEPS-)
-DEPSTMP-all := $(DEPS-all:%.d=%.d.tmp)
-
-CMDS-y := $(call src2cmd,$(SRCS-y))
-CMDS-n := $(call src2cmd,$(SRCS-n))
-CMDS-  := $(call src2cmd,$(SRCS-))
-CMDS-all := $(CMDS-y) $(CMDS-n) $(CMDS-)
-
--include $(DEPS-y) $(CMDS-y)
-
-# command to compile a .c file to generate an object
-ifeq ($(USE_HOST),1)
-C_TO_O = $(HOSTCC) -Wp,-MD,$(call obj2dep,$(@)).tmp $(HOST_CPPFLAGS) $(HOST_CFLAGS) \
-	$(CFLAGS_$(@)) $(HOST_EXTRA_CPPFLAGS) $(HOST_EXTRA_CFLAGS) -o $@ -c $<
-C_TO_O_STR = $(subst ','\'',$(C_TO_O)) #'# fix syntax highlight
-C_TO_O_DISP = $(if $(V),"$(C_TO_O_STR)","  HOSTCC $(@)")
-else
-C_TO_O = $(CC) -Wp,-MD,$(call obj2dep,$(@)).tmp $(CPPFLAGS) $(CFLAGS) \
-	$(CFLAGS_$(@)) $(EXTRA_CPPFLAGS) $(EXTRA_CFLAGS) -o $@ -c $<
-C_TO_O_STR = $(subst ','\'',$(C_TO_O)) #'# fix syntax highlight
-C_TO_O_DISP = $(if $(V),"$(C_TO_O_STR)","  CC $(@)")
-endif
-CHECK_SYMBOLS_SCRIPT = $(RTE_SDK)/buildtools/check-symbols.sh
-CHECK_SYMBOLS = $(CHECK_SYMBOLS_SCRIPT) $(SRCDIR)/$(EXPORT_MAP) $@
-
-PMDINFO_GEN = $(RTE_SDK_BIN)/app/dpdk-pmdinfogen $@ $@.pmd.c
-PMDINFO_CC = $(CC) $(CPPFLAGS) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@.pmd.o $@.pmd.c
-PMDINFO_LD = $(CROSS)ld -r $(filter-out -export-dynamic,$(LDFLAGS)) -o $@.o $@.pmd.o $@
-PMDINFO_TO_O = if grep -q 'RTE_PMD_REGISTER_.*(.*)' $<; then \
-	echo "$(if $V,$(PMDINFO_GEN),  PMDINFO $@.pmd.c)" && \
-	$(PMDINFO_GEN) && \
-	echo "$(if $V,$(PMDINFO_CC),  CC $@.pmd.o)" && \
-	$(PMDINFO_CC) && \
-	echo "$(if $V,$(PMDINFO_LD),  LD $@)" && \
-	$(PMDINFO_LD) && \
-	mv -f $@.o $@; fi
-C_TO_O_CMD = 'cmd_$@ = $(C_TO_O_STR)'
-C_TO_O_DO = @set -e; \
-	echo $(C_TO_O_DISP); \
-	$(C_TO_O) && \
-	$(PMDINFO_TO_O) && \
-	$(CHECK_SYMBOLS) && \
-	echo $(C_TO_O_CMD) > $(call obj2cmd,$(@)) && \
-	sed 's,'$@':,dep_'$@' =,' $(call obj2dep,$(@)).tmp > $(call obj2dep,$(@)) && \
-	rm -f $(call obj2dep,$(@)).tmp
-
-# return an empty string if string are equal
-compare = $(strip $(subst $(1),,$(2)) $(subst $(2),,$(1)))
-
-# return a non-empty string if the dst file does not exist
-file_missing = $(call compare,$(wildcard $@),$@)
-
-# return a non-empty string if cmdline changed
-cmdline_changed = $(call compare,$(strip $(cmd_$@)),$(strip $(1)))
-
-# return a non-empty string if a dependency file does not exist
-depfile_missing = $(call compare,$(wildcard $(dep_$@)),$(dep_$@))
-
-# return an empty string if no prereq is newer than target
-#     - $^ -> names of all the prerequisites
-#     - $(wildcard $^) -> every existing prereq
-#     - $(filter-out $(wildcard $^),$^) -> every prereq that don't
-#       exist (filter-out removes existing ones from the list)
-#     - $? -> names of all the prerequisites newer than target
-depfile_newer = $(strip $(filter-out FORCE,$? \
-	$(filter-out $(wildcard $^),$^)))
-
-# return 1 if parameter is a non-empty string, else 0
-boolean = $(if $1,1,0)
-
-#
-# Compile .c file if needed
-# Note: dep_$$@ is from the .d file and DEP_$$@ can be specified by
-# user (by default it is empty)
-#
-.SECONDEXPANSION:
-%.o: %.c $$(wildcard $$(dep_$$@)) $$(DEP_$$(@)) FORCE
-	@[ -d $(dir $@) ] || mkdir -p $(dir $@)
-	$(if $(D),\
-		@echo -n "$< -> $@ " ; \
-		echo -n "file_missing=$(call boolean,$(file_missing)) " ; \
-		echo -n "cmdline_changed=$(call boolean,$(call cmdline_changed,$(C_TO_O))) " ; \
-		echo -n "depfile_missing=$(call boolean,$(depfile_missing)) " ; \
-		echo "depfile_newer=$(call boolean,$(depfile_newer))")
-	$(if $(or \
-		$(file_missing),\
-		$(call cmdline_changed,$(C_TO_O)),\
-		$(depfile_missing),\
-		$(depfile_newer)),\
-		$(C_TO_O_DO))
-
-# command to assemble a .S file to generate an object
-ifeq ($(USE_HOST),1)
-S_TO_O = $(CPP) $(HOST_CPPFLAGS) $($(@)_CPPFLAGS) $(HOST_EXTRA_CPPFLAGS) $< $(@).tmp && \
-	$(HOSTAS) $(HOST_ASFLAGS) $($(@)_ASFLAGS) $(HOST_EXTRA_ASFLAGS) -o $@ $(@).tmp
-S_TO_O_STR = $(subst ','\'',$(S_TO_O)) #'# fix syntax highlight
-S_TO_O_DISP =  $(if $(V),"$(S_TO_O_STR)","  HOSTAS $(@)")
-else
-S_TO_O = $(CPP) $(CPPFLAGS) $($(@)_CPPFLAGS) $(EXTRA_CPPFLAGS) $< -o $(@).tmp && \
-	$(AS) $(ASFLAGS) $($(@)_ASFLAGS) $(EXTRA_ASFLAGS) -o $@ $(@).tmp
-S_TO_O_STR = $(subst ','\'',$(S_TO_O)) #'# fix syntax highlight
-S_TO_O_DISP =  $(if $(V),"$(S_TO_O_STR)","  AS $(@)")
-endif
-
-S_TO_O_CMD = "cmd_$@ = $(S_TO_O_STR)"
-S_TO_O_DO = @set -e; \
-	echo $(S_TO_O_DISP); \
-	$(S_TO_O) && \
-	echo $(S_TO_O_CMD) > $(call obj2cmd,$(@))
-
-#
-# Compile .S file if needed
-# Note: DEP_$$@ can be specified by user (by default it is empty)
-#
-%_s.o: %.S $$(DEP_$$@) FORCE
-	@[ ! -d $(dir $@) ] || mkdir -p $(dir $@)
-	$(if $(D),\
-		@echo -n "$< -> $@ " ; \
-		echo -n "file_missing=$(call boolean,$(file_missing)) " ; \
-		echo -n "cmdline_changed=$(call boolean,$(call cmdline_changed,$(S_TO_O_STR))) " ; \
-		echo -n "depfile_missing=$(call boolean,$(depfile_missing)) " ; \
-		echo "depfile_newer=$(call boolean,$(depfile_newer)) ")
-	$(if $(or \
-		$(file_missing),\
-		$(call cmdline_changed,$(S_TO_O_STR)),\
-		$(depfile_missing),\
-		$(depfile_newer)),\
-		$(S_TO_O_DO))
diff --git a/mk/internal/rte.extvars.mk b/mk/internal/rte.extvars.mk
deleted file mode 100644
index 98c860628a..0000000000
--- a/mk/internal/rte.extvars.mk
+++ /dev/null
@@ -1,55 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-#
-# directory where sources are located
-#
-ifdef S
-ifeq ("$(origin S)", "command line")
-RTE_SRCDIR := $(abspath $(S))
-endif
-endif
-RTE_SRCDIR  ?= $(CURDIR)
-export RTE_SRCDIR
-
-#
-# Makefile to call once $(RTE_OUTPUT) is created
-#
-ifdef M
-ifeq ("$(origin M)", "command line")
-RTE_EXTMK := $(abspath $(M))
-endif
-endif
-RTE_EXTMK ?= $(RTE_SRCDIR)/$(notdir $(firstword $(MAKEFILE_LIST)))
-export RTE_EXTMK
-
-# RTE_SDK_BIN must point to .config, include/ and lib/.
-RTE_SDK_BIN := $(RTE_SDK)/$(RTE_TARGET)
-ifeq ($(wildcard $(RTE_SDK_BIN)/.config),)
-$(error Cannot find .config in $(RTE_SDK_BIN))
-endif
-
-#
-# Output files wil go in a separate directory: default output is
-# $(RTE_SRCDIR)/build
-# Output dir can be given as command line using "O="
-#
-ifdef O
-ifeq ("$(origin O)", "command line")
-RTE_OUTPUT := $(abspath $(O))
-endif
-endif
-RTE_OUTPUT ?= $(RTE_SRCDIR)/build
-export RTE_OUTPUT
-
-# if we are building an external application, include SDK
-# configuration and include project configuration if any
-include $(RTE_SDK_BIN)/.config
-ifneq ($(wildcard $(RTE_OUTPUT)/.config),)
-  include $(RTE_OUTPUT)/.config
-endif
-# remove double-quotes from config names
-RTE_ARCH := $(CONFIG_RTE_ARCH:"%"=%)
-RTE_MACHINE := $(CONFIG_RTE_MACHINE:"%"=%)
-RTE_EXEC_ENV := $(CONFIG_RTE_EXEC_ENV:"%"=%)
-RTE_TOOLCHAIN := $(CONFIG_RTE_TOOLCHAIN:"%"=%)
diff --git a/mk/internal/rte.install-post.mk b/mk/internal/rte.install-post.mk
deleted file mode 100644
index a1aa0ca4ff..0000000000
--- a/mk/internal/rte.install-post.mk
+++ /dev/null
@@ -1,71 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-# install helper .mk
-
-#
-# generate rules to install files in RTE_OUTPUT.
-#
-# arg1: relative install dir in RTE_OUTPUT
-# arg2: relative file name in a source dir (VPATH)
-#
-define install_rule
-$(addprefix $(RTE_OUTPUT)/$(1)/,$(notdir $(2))): $(2)
-	@echo "  INSTALL-FILE $(addprefix $(1)/,$(notdir $(2)))"
-	@[ -d $(RTE_OUTPUT)/$(1) ] || mkdir -p $(RTE_OUTPUT)/$(1)
-	$(Q)cp -rf $$(<) $(RTE_OUTPUT)/$(1)
-endef
-
-$(foreach dir,$(INSTALL-DIRS-y),\
-	$(foreach file,$(INSTALL-y-$(dir)),\
-		$(eval $(call install_rule,$(dir),$(file)))))
-
-
-#
-# generate rules to install symbolic links of files in RTE_OUTPUT.
-#
-# arg1: relative install dir in RTE_OUTPUT
-# arg2: relative file name in a source dir (VPATH)
-#
-define symlink_rule
-$(addprefix $(RTE_OUTPUT)/$(1)/,$(notdir $(2))): $(2)
-	@echo "  SYMLINK-FILE $(addprefix $(1)/,$(notdir $(2)))"
-	@[ -d $(RTE_OUTPUT)/$(1) ] || mkdir -p $(RTE_OUTPUT)/$(1)
-	$(Q)ln -nsf `$(RTE_SDK)/buildtools/relpath.sh $$(<) $(RTE_OUTPUT)/$(1)` \
-		$(RTE_OUTPUT)/$(1)
-endef
-
-$(foreach dir,$(SYMLINK-DIRS-y),\
-	$(foreach file,$(SYMLINK-y-$(dir)),\
-		$(eval $(call symlink_rule,$(dir),$(file)))))
-
-
-# fast way, no need to do preinstall and postinstall
-ifeq ($(PREINSTALL)$(POSTINSTALL),)
-
-_postinstall: $(_INSTALL)
-	@touch _postinstall
-
-else # slower way
-
-_preinstall: $(PREINSTALL)
-	@touch _preinstall
-
-ifneq ($(_INSTALL),)
-$(_INSTALL): _preinstall
-else
-_INSTALL = _preinstall
-endif
-
-_install: $(_INSTALL)
-	@touch _install
-
-ifneq ($(POSTINSTALL),)
-$(POSTINSTALL): _install
-else
-POSTINSTALL = _install
-endif
-
-_postinstall: $(POSTINSTALL)
-	@touch _postinstall
-endif
diff --git a/mk/internal/rte.install-pre.mk b/mk/internal/rte.install-pre.mk
deleted file mode 100644
index 4786d3b28b..0000000000
--- a/mk/internal/rte.install-pre.mk
+++ /dev/null
@@ -1,32 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-#
-# get all variables starting with "INSTALL-y-", and extract the
-# installation dir and path
-#
-INSTALL-y := $(filter INSTALL-y-%,$(.VARIABLES))
-INSTALL-n := $(filter INSTALL-n-%,$(.VARIABLES))
-INSTALL- := $(filter INSTALL--%,$(.VARIABLES))
-INSTALL-DIRS-y := $(patsubst INSTALL-y-%,%,$(INSTALL-y))
-INSTALL-FILES-y := $(foreach i,$(INSTALL-DIRS-y),\
-	$(addprefix $(RTE_OUTPUT)/$(i)/,$(notdir $(INSTALL-y-$(i)))))
-INSTALL-FILES-all := $(foreach i,$(INSTALL-DIRS-y) $(INSTALL-DIRS-n) $(INSTALL-DIRS-),\
-	$(addprefix $(RTE_OUTPUT)/$(i)/,$(notdir $(INSTALL-y-$(i)))))
-
-_INSTALL_TARGETS := _preinstall _install _postinstall
-
-#
-# get all variables starting with "SYMLINK-y-", and extract the
-# installation dir and path
-#
-SYMLINK-y := $(filter SYMLINK-y-%,$(.VARIABLES))
-SYMLINK-n := $(filter SYMLINK-n-%,$(.VARIABLES))
-SYMLINK- := $(filter SYMLINK--%,$(.VARIABLES))
-SYMLINK-DIRS-y := $(patsubst SYMLINK-y-%,%,$(SYMLINK-y))
-SYMLINK-FILES-y := $(foreach i,$(SYMLINK-DIRS-y),\
-	$(addprefix $(RTE_OUTPUT)/$(i)/,$(notdir $(SYMLINK-y-$(i)))))
-SYMLINK-FILES-all := $(foreach i,$(SYMLINK-DIRS-y) $(SYMLINK-DIRS-n) $(SYMLINK-DIRS-),\
-	$(addprefix $(RTE_OUTPUT)/$(i)/,$(notdir $(SYMLINK-y-$(i)))))
-
-_SYMLINK_TARGETS := _presymlink _symlink _postsymlink
diff --git a/mk/machine/armv7a/rte.vars.mk b/mk/machine/armv7a/rte.vars.mk
deleted file mode 100644
index 44ebd68dae..0000000000
--- a/mk/machine/armv7a/rte.vars.mk
+++ /dev/null
@@ -1,36 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright (C) 2015 RehiveTech. All rights reserved.
-
-#
-# machine:
-#
-#   - can define ARCH variable (overridden by cmdline value)
-#   - can define CROSS variable (overridden by cmdline value)
-#   - define MACHINE_CFLAGS variable (overridden by cmdline value)
-#   - define MACHINE_LDFLAGS variable (overridden by cmdline value)
-#   - define MACHINE_ASFLAGS variable (overridden by cmdline value)
-#   - can define CPU_CFLAGS variable (overridden by cmdline value) that
-#     overrides the one defined in arch.
-#   - can define CPU_LDFLAGS variable (overridden by cmdline value) that
-#     overrides the one defined in arch.
-#   - can define CPU_ASFLAGS variable (overridden by cmdline value) that
-#     overrides the one defined in arch.
-#   - may override any previously defined variable
-#
-
-# ARCH =
-# CROSS =
-# MACHINE_CFLAGS =
-# MACHINE_LDFLAGS =
-# MACHINE_ASFLAGS =
-# CPU_CFLAGS =
-# CPU_LDFLAGS =
-# CPU_ASFLAGS =
-
-MACHINE_CFLAGS += -march=armv7-a
-
-ifdef CONFIG_RTE_ARCH_ARM_TUNE
-MACHINE_CFLAGS += -mtune=$(CONFIG_RTE_ARCH_ARM_TUNE:"%"=%)
-endif
-
-MACHINE_CFLAGS += -mfpu=neon
diff --git a/mk/machine/armv8a/rte.vars.mk b/mk/machine/armv8a/rte.vars.mk
deleted file mode 100644
index 5e3ffc3adf..0000000000
--- a/mk/machine/armv8a/rte.vars.mk
+++ /dev/null
@@ -1,31 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2015 Cavium, Inc
-#
-
-#
-# machine:
-#
-#   - can define ARCH variable (overridden by cmdline value)
-#   - can define CROSS variable (overridden by cmdline value)
-#   - define MACHINE_CFLAGS variable (overridden by cmdline value)
-#   - define MACHINE_LDFLAGS variable (overridden by cmdline value)
-#   - define MACHINE_ASFLAGS variable (overridden by cmdline value)
-#   - can define CPU_CFLAGS variable (overridden by cmdline value) that
-#     overrides the one defined in arch.
-#   - can define CPU_LDFLAGS variable (overridden by cmdline value) that
-#     overrides the one defined in arch.
-#   - can define CPU_ASFLAGS variable (overridden by cmdline value) that
-#     overrides the one defined in arch.
-#   - may override any previously defined variable
-#
-
-# ARCH =
-# CROSS =
-# MACHINE_CFLAGS =
-# MACHINE_LDFLAGS =
-# MACHINE_ASFLAGS =
-# CPU_CFLAGS =
-# CPU_LDFLAGS =
-# CPU_ASFLAGS =
-
-MACHINE_CFLAGS += -march=armv8-a+crc
diff --git a/mk/machine/default/rte.vars.mk b/mk/machine/default/rte.vars.mk
deleted file mode 100644
index df08d3b038..0000000000
--- a/mk/machine/default/rte.vars.mk
+++ /dev/null
@@ -1,30 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-#
-# machine:
-#
-#   - can define ARCH variable (overridden by cmdline value)
-#   - can define CROSS variable (overridden by cmdline value)
-#   - define MACHINE_CFLAGS variable (overridden by cmdline value)
-#   - define MACHINE_LDFLAGS variable (overridden by cmdline value)
-#   - define MACHINE_ASFLAGS variable (overridden by cmdline value)
-#   - can define CPU_CFLAGS variable (overridden by cmdline value) that
-#     overrides the one defined in arch.
-#   - can define CPU_LDFLAGS variable (overridden by cmdline value) that
-#     overrides the one defined in arch.
-#   - can define CPU_ASFLAGS variable (overridden by cmdline value) that
-#     overrides the one defined in arch.
-#   - may override any previously defined variable
-#
-
-# ARCH =
-# CROSS =
-# MACHINE_CFLAGS =
-# MACHINE_LDFLAGS =
-# MACHINE_ASFLAGS =
-# CPU_CFLAGS =
-# CPU_LDFLAGS =
-# CPU_ASFLAGS =
-
-MACHINE_CFLAGS += -march=corei7
diff --git a/mk/machine/dpaa/rte.vars.mk b/mk/machine/dpaa/rte.vars.mk
deleted file mode 100644
index 75df626ff2..0000000000
--- a/mk/machine/dpaa/rte.vars.mk
+++ /dev/null
@@ -1,37 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright (c) 2016 Freescale Semiconductor, Inc. All rights reserved.
-# Copyright 2017 NXP
-
-#
-# machine:
-#
-#   - can define ARCH variable (overridden by cmdline value)
-#   - can define CROSS variable (overridden by cmdline value)
-#   - define MACHINE_CFLAGS variable (overridden by cmdline value)
-#   - define MACHINE_LDFLAGS variable (overridden by cmdline value)
-#   - define MACHINE_ASFLAGS variable (overridden by cmdline value)
-#   - can define CPU_CFLAGS variable (overridden by cmdline value) that
-#     overrides the one defined in arch.
-#   - can define CPU_LDFLAGS variable (overridden by cmdline value) that
-#     overrides the one defined in arch.
-#   - can define CPU_ASFLAGS variable (overridden by cmdline value) that
-#     overrides the one defined in arch.
-#   - may override any previously defined variable
-#
-
-# ARCH =
-# CROSS =
-# MACHINE_CFLAGS =
-# MACHINE_LDFLAGS =
-# MACHINE_ASFLAGS =
-# CPU_CFLAGS =
-# CPU_LDFLAGS =
-# CPU_ASFLAGS =
-MACHINE_CFLAGS += -march=armv8-a+crc
-
-ifdef CONFIG_RTE_ARCH_ARM_TUNE
-MACHINE_CFLAGS += -mtune=$(CONFIG_RTE_ARCH_ARM_TUNE:"%"=%)
-endif
-
-# To avoid TLS corruption issue.
-MACHINE_CFLAGS += -mtls-dialect=trad
diff --git a/mk/machine/emag/rte.vars.mk b/mk/machine/emag/rte.vars.mk
deleted file mode 100644
index 50342dfa27..0000000000
--- a/mk/machine/emag/rte.vars.mk
+++ /dev/null
@@ -1,32 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2019 Ampere Computing
-#
-
-#
-# machine:
-#
-#   - can define ARCH variable (overridden by cmdline value)
-#   - can define CROSS variable (overridden by cmdline value)
-#   - define MACHINE_CFLAGS variable (overridden by cmdline value)
-#   - define MACHINE_LDFLAGS variable (overridden by cmdline value)
-#   - define MACHINE_ASFLAGS variable (overridden by cmdline value)
-#   - can define CPU_CFLAGS variable (overridden by cmdline value) that
-#     overrides the one defined in arch.
-#   - can define CPU_LDFLAGS variable (overridden by cmdline value) that
-#     overrides the one defined in arch.
-#   - can define CPU_ASFLAGS variable (overridden by cmdline value) that
-#     overrides the one defined in arch.
-#   - may override any previously defined variable
-#
-
-# ARCH =
-# CROSS =
-# MACHINE_CFLAGS =
-# MACHINE_LDFLAGS =
-# MACHINE_ASFLAGS =
-# CPU_CFLAGS =
-# CPU_LDFLAGS =
-# CPU_ASFLAGS =
-
-MACHINE_CFLAGS += -march=armv8-a+crc+crypto
-MACHINE_CFLAGS += $(call rte_cc_has_argument, -mtune=emag)
diff --git a/mk/machine/hsw/rte.vars.mk b/mk/machine/hsw/rte.vars.mk
deleted file mode 100644
index 39099e760e..0000000000
--- a/mk/machine/hsw/rte.vars.mk
+++ /dev/null
@@ -1,30 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-#
-# machine:
-#
-#   - can define ARCH variable (overridden by cmdline value)
-#   - can define CROSS variable (overridden by cmdline value)
-#   - define MACHINE_CFLAGS variable (overridden by cmdline value)
-#   - define MACHINE_LDFLAGS variable (overridden by cmdline value)
-#   - define MACHINE_ASFLAGS variable (overridden by cmdline value)
-#   - can define CPU_CFLAGS variable (overridden by cmdline value) that
-#     overrides the one defined in arch.
-#   - can define CPU_LDFLAGS variable (overridden by cmdline value) that
-#     overrides the one defined in arch.
-#   - can define CPU_ASFLAGS variable (overridden by cmdline value) that
-#     overrides the one defined in arch.
-#   - may override any previously defined variable
-#
-
-# ARCH =
-# CROSS =
-# MACHINE_CFLAGS =
-# MACHINE_LDFLAGS =
-# MACHINE_ASFLAGS =
-# CPU_CFLAGS =
-# CPU_LDFLAGS =
-# CPU_ASFLAGS =
-
-MACHINE_CFLAGS = -march=core-avx2
diff --git a/mk/machine/ivb/rte.vars.mk b/mk/machine/ivb/rte.vars.mk
deleted file mode 100644
index 5b6563742a..0000000000
--- a/mk/machine/ivb/rte.vars.mk
+++ /dev/null
@@ -1,30 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-#
-# machine:
-#
-#   - can define ARCH variable (overridden by cmdline value)
-#   - can define CROSS variable (overridden by cmdline value)
-#   - define MACHINE_CFLAGS variable (overridden by cmdline value)
-#   - define MACHINE_LDFLAGS variable (overridden by cmdline value)
-#   - define MACHINE_ASFLAGS variable (overridden by cmdline value)
-#   - can define CPU_CFLAGS variable (overridden by cmdline value) that
-#     overrides the one defined in arch.
-#   - can define CPU_LDFLAGS variable (overridden by cmdline value) that
-#     overrides the one defined in arch.
-#   - can define CPU_ASFLAGS variable (overridden by cmdline value) that
-#     overrides the one defined in arch.
-#   - may override any previously defined variable
-#
-
-# ARCH =
-# CROSS =
-# MACHINE_CFLAGS =
-# MACHINE_LDFLAGS =
-# MACHINE_ASFLAGS =
-# CPU_CFLAGS =
-# CPU_LDFLAGS =
-# CPU_ASFLAGS =
-
-MACHINE_CFLAGS = -march=core-avx-i
diff --git a/mk/machine/n1sdp/rte.vars.mk b/mk/machine/n1sdp/rte.vars.mk
deleted file mode 100644
index 6d69de03c9..0000000000
--- a/mk/machine/n1sdp/rte.vars.mk
+++ /dev/null
@@ -1,34 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2019 Arm Ltd
-#
-
-#
-# machine:
-#
-#   - can define ARCH variable (overridden by cmdline value)
-#   - can define CROSS variable (overridden by cmdline value)
-#   - define MACHINE_CFLAGS variable (overridden by cmdline value)
-#   - define MACHINE_LDFLAGS variable (overridden by cmdline value)
-#   - define MACHINE_ASFLAGS variable (overridden by cmdline value)
-#   - can define CPU_CFLAGS variable (overridden by cmdline value) that
-#     overrides the one defined in arch.
-#   - can define CPU_LDFLAGS variable (overridden by cmdline value) that
-#     overrides the one defined in arch.
-#   - can define CPU_ASFLAGS variable (overridden by cmdline value) that
-#     overrides the one defined in arch.
-#   - may override any previously defined variable
-#
-
-# ARCH =
-# CROSS =
-# MACHINE_CFLAGS =
-# MACHINE_LDFLAGS =
-# MACHINE_ASFLAGS =
-# CPU_CFLAGS =
-# CPU_LDFLAGS =
-# CPU_ASFLAGS =
-
-include $(RTE_SDK)/mk/rte.helper.mk
-
-MACHINE_CFLAGS += $(call rte_cc_has_argument, -march=armv8.2-a+crc+crypto)
-MACHINE_CFLAGS += $(call rte_cc_has_argument, -mcpu=neoverse-n1)
diff --git a/mk/machine/native/rte.vars.mk b/mk/machine/native/rte.vars.mk
deleted file mode 100644
index 8c96e3fa04..0000000000
--- a/mk/machine/native/rte.vars.mk
+++ /dev/null
@@ -1,39 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-#
-# machine:
-#
-#   - can define ARCH variable (overridden by cmdline value)
-#   - can define CROSS variable (overridden by cmdline value)
-#   - define MACHINE_CFLAGS variable (overridden by cmdline value)
-#   - define MACHINE_LDFLAGS variable (overridden by cmdline value)
-#   - define MACHINE_ASFLAGS variable (overridden by cmdline value)
-#   - can define CPU_CFLAGS variable (overridden by cmdline value) that
-#     overrides the one defined in arch.
-#   - can define CPU_LDFLAGS variable (overridden by cmdline value) that
-#     overrides the one defined in arch.
-#   - can define CPU_ASFLAGS variable (overridden by cmdline value) that
-#     overrides the one defined in arch.
-#   - may override any previously defined variable
-#
-
-# ARCH =
-# CROSS =
-# MACHINE_CFLAGS =
-# MACHINE_LDFLAGS =
-# MACHINE_ASFLAGS =
-# CPU_CFLAGS =
-# CPU_LDFLAGS =
-# CPU_ASFLAGS =
-
-MACHINE_CFLAGS = -march=native
-
-# On FreeBSD systems, sometimes the correct CPU type is not picked up.
-# To get everything to compile, we need SSE4.2 support, so check if that is
-# reported by compiler. If not, check if the CPU actually supports it, and if
-# so, set the compilation target to be a corei7, minimum target with SSE4.2.
-SSE42_SUPPORT=$(shell $(CC) -march=native -dM -E - </dev/null | grep SSE4_2)
-ifeq ($(SSE42_SUPPORT),)
-    MACHINE_CFLAGS = -march=corei7
-endif
diff --git a/mk/machine/nhm/rte.vars.mk b/mk/machine/nhm/rte.vars.mk
deleted file mode 100644
index 91de5d9bed..0000000000
--- a/mk/machine/nhm/rte.vars.mk
+++ /dev/null
@@ -1,30 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-#
-# machine:
-#
-#   - can define ARCH variable (overridden by cmdline value)
-#   - can define CROSS variable (overridden by cmdline value)
-#   - define MACHINE_CFLAGS variable (overridden by cmdline value)
-#   - define MACHINE_LDFLAGS variable (overridden by cmdline value)
-#   - define MACHINE_ASFLAGS variable (overridden by cmdline value)
-#   - can define CPU_CFLAGS variable (overridden by cmdline value) that
-#     overrides the one defined in arch.
-#   - can define CPU_LDFLAGS variable (overridden by cmdline value) that
-#     overrides the one defined in arch.
-#   - can define CPU_ASFLAGS variable (overridden by cmdline value) that
-#     overrides the one defined in arch.
-#   - may override any previously defined variable
-#
-
-# ARCH =
-# CROSS =
-# MACHINE_CFLAGS =
-# MACHINE_LDFLAGS =
-# MACHINE_ASFLAGS =
-# CPU_CFLAGS =
-# CPU_LDFLAGS =
-# CPU_ASFLAGS =
-
-MACHINE_CFLAGS = -march=corei7
diff --git a/mk/machine/octeontx2/rte.vars.mk b/mk/machine/octeontx2/rte.vars.mk
deleted file mode 100644
index e209cf4920..0000000000
--- a/mk/machine/octeontx2/rte.vars.mk
+++ /dev/null
@@ -1,34 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2018 Marvell International Ltd
-#
-
-#
-# machine:
-#
-#   - can define ARCH variable (overridden by cmdline value)
-#   - can define CROSS variable (overridden by cmdline value)
-#   - define MACHINE_CFLAGS variable (overridden by cmdline value)
-#   - define MACHINE_LDFLAGS variable (overridden by cmdline value)
-#   - define MACHINE_ASFLAGS variable (overridden by cmdline value)
-#   - can define CPU_CFLAGS variable (overridden by cmdline value) that
-#     overrides the one defined in arch.
-#   - can define CPU_LDFLAGS variable (overridden by cmdline value) that
-#     overrides the one defined in arch.
-#   - can define CPU_ASFLAGS variable (overridden by cmdline value) that
-#     overrides the one defined in arch.
-#   - may override any previously defined variable
-#
-
-# ARCH =
-# CROSS =
-# MACHINE_CFLAGS =
-# MACHINE_LDFLAGS =
-# MACHINE_ASFLAGS =
-# CPU_CFLAGS =
-# CPU_LDFLAGS =
-# CPU_ASFLAGS =
-
-include $(RTE_SDK)/mk/rte.helper.mk
-
-MACHINE_CFLAGS += $(call rte_cc_has_argument, -march=armv8.2-a+crc+crypto+lse)
-MACHINE_CFLAGS += $(call rte_cc_has_argument, -mcpu=octeontx2)
diff --git a/mk/machine/power8/rte.vars.mk b/mk/machine/power8/rte.vars.mk
deleted file mode 100644
index 00e0834b8a..0000000000
--- a/mk/machine/power8/rte.vars.mk
+++ /dev/null
@@ -1,30 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright (C) IBM Corporation 2014.
-
-#
-# machine:
-#
-#   - can define ARCH variable (overridden by cmdline value)
-#   - can define CROSS variable (overridden by cmdline value)
-#   - define MACHINE_CFLAGS variable (overridden by cmdline value)
-#   - define MACHINE_LDFLAGS variable (overridden by cmdline value)
-#   - define MACHINE_ASFLAGS variable (overridden by cmdline value)
-#   - can define CPU_CFLAGS variable (overridden by cmdline value) that
-#     overrides the one defined in arch.
-#   - can define CPU_LDFLAGS variable (overridden by cmdline value) that
-#     overrides the one defined in arch.
-#   - can define CPU_ASFLAGS variable (overridden by cmdline value) that
-#     overrides the one defined in arch.
-#   - may override any previously defined variable
-#
-
-# ARCH =
-# CROSS =
-# MACHINE_CFLAGS =
-# MACHINE_LDFLAGS =
-# MACHINE_ASFLAGS =
-# CPU_CFLAGS =
-# CPU_LDFLAGS =
-# CPU_ASFLAGS =
-
-MACHINE_CFLAGS =
diff --git a/mk/machine/silvermont/rte.vars.mk b/mk/machine/silvermont/rte.vars.mk
deleted file mode 100644
index e4f3fe42bd..0000000000
--- a/mk/machine/silvermont/rte.vars.mk
+++ /dev/null
@@ -1,30 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-#
-# machine:
-#
-#   - can define ARCH variable (overridden by cmdline value)
-#   - can define CROSS variable (overridden by cmdline value)
-#   - define MACHINE_CFLAGS variable (overridden by cmdline value)
-#   - define MACHINE_LDFLAGS variable (overridden by cmdline value)
-#   - define MACHINE_ASFLAGS variable (overridden by cmdline value)
-#   - can define CPU_CFLAGS variable (overridden by cmdline value) that
-#     overrides the one defined in arch.
-#   - can define CPU_LDFLAGS variable (overridden by cmdline value) that
-#     overrides the one defined in arch.
-#   - can define CPU_ASFLAGS variable (overridden by cmdline value) that
-#     overrides the one defined in arch.
-#   - may override any previously defined variable
-#
-
-# ARCH =
-# CROSS =
-# MACHINE_CFLAGS =
-# MACHINE_LDFLAGS =
-# MACHINE_ASFLAGS =
-# CPU_CFLAGS =
-# CPU_LDFLAGS =
-# CPU_ASFLAGS =
-
-MACHINE_CFLAGS = -march=silvermont
diff --git a/mk/machine/snb/rte.vars.mk b/mk/machine/snb/rte.vars.mk
deleted file mode 100644
index efe2f32d70..0000000000
--- a/mk/machine/snb/rte.vars.mk
+++ /dev/null
@@ -1,30 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-#
-# machine:
-#
-#   - can define ARCH variable (overridden by cmdline value)
-#   - can define CROSS variable (overridden by cmdline value)
-#   - define MACHINE_CFLAGS variable (overridden by cmdline value)
-#   - define MACHINE_LDFLAGS variable (overridden by cmdline value)
-#   - define MACHINE_ASFLAGS variable (overridden by cmdline value)
-#   - can define CPU_CFLAGS variable (overridden by cmdline value) that
-#     overrides the one defined in arch.
-#   - can define CPU_LDFLAGS variable (overridden by cmdline value) that
-#     overrides the one defined in arch.
-#   - can define CPU_ASFLAGS variable (overridden by cmdline value) that
-#     overrides the one defined in arch.
-#   - may override any previously defined variable
-#
-
-# ARCH =
-# CROSS =
-# MACHINE_CFLAGS =
-# MACHINE_LDFLAGS =
-# MACHINE_ASFLAGS =
-# CPU_CFLAGS =
-# CPU_LDFLAGS =
-# CPU_ASFLAGS =
-
-MACHINE_CFLAGS = -march=corei7-avx
diff --git a/mk/machine/thunderx/rte.vars.mk b/mk/machine/thunderx/rte.vars.mk
deleted file mode 100644
index 047741668c..0000000000
--- a/mk/machine/thunderx/rte.vars.mk
+++ /dev/null
@@ -1,31 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2015 Cavium, Inc
-#
-
-#
-# machine:
-#
-#   - can define ARCH variable (overridden by cmdline value)
-#   - can define CROSS variable (overridden by cmdline value)
-#   - define MACHINE_CFLAGS variable (overridden by cmdline value)
-#   - define MACHINE_LDFLAGS variable (overridden by cmdline value)
-#   - define MACHINE_ASFLAGS variable (overridden by cmdline value)
-#   - can define CPU_CFLAGS variable (overridden by cmdline value) that
-#     overrides the one defined in arch.
-#   - can define CPU_LDFLAGS variable (overridden by cmdline value) that
-#     overrides the one defined in arch.
-#   - can define CPU_ASFLAGS variable (overridden by cmdline value) that
-#     overrides the one defined in arch.
-#   - may override any previously defined variable
-#
-
-# ARCH =
-# CROSS =
-# MACHINE_CFLAGS =
-# MACHINE_LDFLAGS =
-# MACHINE_ASFLAGS =
-# CPU_CFLAGS =
-# CPU_LDFLAGS =
-# CPU_ASFLAGS =
-
-MACHINE_CFLAGS += -march=armv8-a+crc+crypto -mcpu=thunderx
diff --git a/mk/machine/thunderx2/rte.vars.mk b/mk/machine/thunderx2/rte.vars.mk
deleted file mode 100644
index b80dc8680c..0000000000
--- a/mk/machine/thunderx2/rte.vars.mk
+++ /dev/null
@@ -1,34 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2018 Marvell International Ltd
-#
-
-#
-# machine:
-#
-#   - can define ARCH variable (overridden by cmdline value)
-#   - can define CROSS variable (overridden by cmdline value)
-#   - define MACHINE_CFLAGS variable (overridden by cmdline value)
-#   - define MACHINE_LDFLAGS variable (overridden by cmdline value)
-#   - define MACHINE_ASFLAGS variable (overridden by cmdline value)
-#   - can define CPU_CFLAGS variable (overridden by cmdline value) that
-#     overrides the one defined in arch.
-#   - can define CPU_LDFLAGS variable (overridden by cmdline value) that
-#     overrides the one defined in arch.
-#   - can define CPU_ASFLAGS variable (overridden by cmdline value) that
-#     overrides the one defined in arch.
-#   - may override any previously defined variable
-#
-
-# ARCH =
-# CROSS =
-# MACHINE_CFLAGS =
-# MACHINE_LDFLAGS =
-# MACHINE_ASFLAGS =
-# CPU_CFLAGS =
-# CPU_LDFLAGS =
-# CPU_ASFLAGS =
-
-include $(RTE_SDK)/mk/rte.helper.mk
-
-MACHINE_CFLAGS += $(call rte_cc_has_argument, -march=armv8.1-a+crc+crypto)
-MACHINE_CFLAGS += $(call rte_cc_has_argument, -mcpu=thunderx2t99)
diff --git a/mk/machine/wsm/rte.vars.mk b/mk/machine/wsm/rte.vars.mk
deleted file mode 100644
index e9bc3f9848..0000000000
--- a/mk/machine/wsm/rte.vars.mk
+++ /dev/null
@@ -1,30 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-#
-# machine:
-#
-#   - can define ARCH variable (overridden by cmdline value)
-#   - can define CROSS variable (overridden by cmdline value)
-#   - define MACHINE_CFLAGS variable (overridden by cmdline value)
-#   - define MACHINE_LDFLAGS variable (overridden by cmdline value)
-#   - define MACHINE_ASFLAGS variable (overridden by cmdline value)
-#   - can define CPU_CFLAGS variable (overridden by cmdline value) that
-#     overrides the one defined in arch.
-#   - can define CPU_LDFLAGS variable (overridden by cmdline value) that
-#     overrides the one defined in arch.
-#   - can define CPU_ASFLAGS variable (overridden by cmdline value) that
-#     overrides the one defined in arch.
-#   - may override any previously defined variable
-#
-
-# ARCH =
-# CROSS =
-# MACHINE_CFLAGS =
-# MACHINE_LDFLAGS =
-# MACHINE_ASFLAGS =
-# CPU_CFLAGS =
-# CPU_LDFLAGS =
-# CPU_ASFLAGS =
-
-MACHINE_CFLAGS = -march=corei7 -maes -mpclmul
diff --git a/mk/machine/xgene1/rte.vars.mk b/mk/machine/xgene1/rte.vars.mk
deleted file mode 100644
index e632f3139b..0000000000
--- a/mk/machine/xgene1/rte.vars.mk
+++ /dev/null
@@ -1,31 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2015 Cavium, Inc
-#
-
-#
-# machine:
-#
-#   - can define ARCH variable (overridden by cmdline value)
-#   - can define CROSS variable (overridden by cmdline value)
-#   - define MACHINE_CFLAGS variable (overridden by cmdline value)
-#   - define MACHINE_LDFLAGS variable (overridden by cmdline value)
-#   - define MACHINE_ASFLAGS variable (overridden by cmdline value)
-#   - can define CPU_CFLAGS variable (overridden by cmdline value) that
-#     overrides the one defined in arch.
-#   - can define CPU_LDFLAGS variable (overridden by cmdline value) that
-#     overrides the one defined in arch.
-#   - can define CPU_ASFLAGS variable (overridden by cmdline value) that
-#     overrides the one defined in arch.
-#   - may override any previously defined variable
-#
-
-# ARCH =
-# CROSS =
-# MACHINE_CFLAGS =
-# MACHINE_LDFLAGS =
-# MACHINE_ASFLAGS =
-# CPU_CFLAGS =
-# CPU_LDFLAGS =
-# CPU_ASFLAGS =
-
-MACHINE_CFLAGS += -march=armv8-a
diff --git a/mk/rte.app.mk b/mk/rte.app.mk
deleted file mode 100644
index a544259970..0000000000
--- a/mk/rte.app.mk
+++ /dev/null
@@ -1,509 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2017 Intel Corporation.
-# Copyright(c) 2014-2015 6WIND S.A.
-
-include $(RTE_SDK)/mk/internal/rte.compile-pre.mk
-include $(RTE_SDK)/mk/internal/rte.install-pre.mk
-include $(RTE_SDK)/mk/internal/rte.clean-pre.mk
-include $(RTE_SDK)/mk/internal/rte.build-pre.mk
-
-# VPATH contains at least SRCDIR
-VPATH += $(SRCDIR)
-
-_BUILD = $(APP)
-_INSTALL = $(INSTALL-FILES-y) $(SYMLINK-FILES-y)
-_INSTALL += $(RTE_OUTPUT)/app/$(APP) $(RTE_OUTPUT)/app/$(APP).map
-POSTINSTALL += target-appinstall
-_CLEAN = doclean
-POSTCLEAN += target-appclean
-
-ifeq ($(NO_LDSCRIPT),)
-LDSCRIPT = $(RTE_LDSCRIPT)
-endif
-
-# Link only the libraries used in the application
-LDFLAGS += --as-needed
-
-# default path for libs
-_LDLIBS-y += -L$(RTE_SDK_BIN)/lib
-
-#
-# Order is important: from higher level to lower level
-#
-_LDLIBS-$(CONFIG_RTE_LIBRTE_FLOW_CLASSIFY)  += -lrte_flow_classify
-_LDLIBS-$(CONFIG_RTE_LIBRTE_PIPELINE)       += --whole-archive
-_LDLIBS-$(CONFIG_RTE_LIBRTE_PIPELINE)       += -lrte_pipeline
-_LDLIBS-$(CONFIG_RTE_LIBRTE_PIPELINE)       += --no-whole-archive
-_LDLIBS-$(CONFIG_RTE_LIBRTE_TABLE)          += --whole-archive
-_LDLIBS-$(CONFIG_RTE_LIBRTE_TABLE)          += -lrte_table
-_LDLIBS-$(CONFIG_RTE_LIBRTE_TABLE)          += --no-whole-archive
-_LDLIBS-$(CONFIG_RTE_LIBRTE_PORT)           += --whole-archive
-_LDLIBS-$(CONFIG_RTE_LIBRTE_PORT)           += -lrte_port
-_LDLIBS-$(CONFIG_RTE_LIBRTE_PORT)           += --no-whole-archive
-
-_LDLIBS-$(CONFIG_RTE_LIBRTE_PDUMP)          += -lrte_pdump
-_LDLIBS-$(CONFIG_RTE_LIBRTE_DISTRIBUTOR)    += -lrte_distributor
-_LDLIBS-$(CONFIG_RTE_LIBRTE_IP_FRAG)        += -lrte_ip_frag
-_LDLIBS-$(CONFIG_RTE_LIBRTE_METER)          += -lrte_meter
-_LDLIBS-$(CONFIG_RTE_LIBRTE_FIB)            += -lrte_fib
-_LDLIBS-$(CONFIG_RTE_LIBRTE_RIB)            += -lrte_rib
-_LDLIBS-$(CONFIG_RTE_LIBRTE_LPM)            += -lrte_lpm
-_LDLIBS-$(CONFIG_RTE_LIBRTE_ACL)            += -lrte_acl
-_LDLIBS-$(CONFIG_RTE_LIBRTE_JOBSTATS)       += -lrte_jobstats
-_LDLIBS-$(CONFIG_RTE_LIBRTE_METRICS)        += --whole-archive
-_LDLIBS-$(CONFIG_RTE_LIBRTE_METRICS)        += -lrte_metrics
-ifeq ($(CONFIG_RTE_LIBRTE_TELEMETRY),y)
-_LDLIBS-$(CONFIG_RTE_LIBRTE_METRICS)        += -ljansson
-endif
-_LDLIBS-$(CONFIG_RTE_LIBRTE_METRICS)        += --no-whole-archive
-_LDLIBS-$(CONFIG_RTE_LIBRTE_BITRATE)        += -lrte_bitratestats
-_LDLIBS-$(CONFIG_RTE_LIBRTE_LATENCY_STATS)  += -lrte_latencystats
-_LDLIBS-$(CONFIG_RTE_LIBRTE_POWER)          += -lrte_power
-
-_LDLIBS-$(CONFIG_RTE_LIBRTE_EFD)            += -lrte_efd
-_LDLIBS-$(CONFIG_RTE_LIBRTE_BPF)            += -lrte_bpf
-ifeq ($(CONFIG_RTE_LIBRTE_BPF_ELF),y)
-_LDLIBS-$(CONFIG_RTE_LIBRTE_BPF)            += -lelf
-endif
-
-_LDLIBS-$(CONFIG_RTE_LIBRTE_IPSEC)            += -lrte_ipsec
-
-_LDLIBS-y += --whole-archive
-
-_LDLIBS-$(CONFIG_RTE_LIBRTE_CFGFILE)        += -lrte_cfgfile
-_LDLIBS-$(CONFIG_RTE_LIBRTE_GRO)            += -lrte_gro
-_LDLIBS-$(CONFIG_RTE_LIBRTE_GSO)            += -lrte_gso
-_LDLIBS-$(CONFIG_RTE_LIBRTE_HASH)           += -lrte_hash
-_LDLIBS-$(CONFIG_RTE_LIBRTE_MEMBER)         += -lrte_member
-_LDLIBS-$(CONFIG_RTE_LIBRTE_VHOST)          += -lrte_vhost
-_LDLIBS-$(CONFIG_RTE_LIBRTE_KVARGS)         += -lrte_kvargs
-_LDLIBS-y                                   += -lrte_telemetry
-_LDLIBS-$(CONFIG_RTE_LIBRTE_MBUF)           += -lrte_mbuf
-_LDLIBS-$(CONFIG_RTE_LIBRTE_NET)            += -lrte_net
-_LDLIBS-$(CONFIG_RTE_LIBRTE_ETHER)          += -lrte_ethdev
-_LDLIBS-$(CONFIG_RTE_LIBRTE_BBDEV)          += -lrte_bbdev
-_LDLIBS-$(CONFIG_RTE_LIBRTE_CRYPTODEV)      += -lrte_cryptodev
-_LDLIBS-$(CONFIG_RTE_LIBRTE_SECURITY)       += -lrte_security
-_LDLIBS-$(CONFIG_RTE_LIBRTE_COMPRESSDEV)    += -lrte_compressdev
-_LDLIBS-$(CONFIG_RTE_LIBRTE_REGEXDEV)       += -lrte_regexdev
-_LDLIBS-$(CONFIG_RTE_LIBRTE_EVENTDEV)       += -lrte_eventdev
-_LDLIBS-$(CONFIG_RTE_LIBRTE_RAWDEV)         += -lrte_rawdev
-_LDLIBS-$(CONFIG_RTE_LIBRTE_TIMER)          += -lrte_timer
-_LDLIBS-$(CONFIG_RTE_LIBRTE_MEMPOOL)        += -lrte_mempool
-_LDLIBS-$(CONFIG_RTE_LIBRTE_STACK)          += -lrte_stack
-_LDLIBS-$(CONFIG_RTE_DRIVER_MEMPOOL_RING)   += -lrte_mempool_ring
-_LDLIBS-$(CONFIG_RTE_LIBRTE_OCTEONTX2_MEMPOOL) += -lrte_mempool_octeontx2
-_LDLIBS-$(CONFIG_RTE_LIBRTE_RING)           += -lrte_ring
-_LDLIBS-$(CONFIG_RTE_LIBRTE_PCI)            += -lrte_pci
-_LDLIBS-$(CONFIG_RTE_LIBRTE_EAL)            += -lrte_eal
-_LDLIBS-$(CONFIG_RTE_LIBRTE_CMDLINE)        += -lrte_cmdline
-_LDLIBS-$(CONFIG_RTE_LIBRTE_REORDER)        += -lrte_reorder
-_LDLIBS-$(CONFIG_RTE_LIBRTE_SCHED)          += -lrte_sched
-_LDLIBS-$(CONFIG_RTE_LIBRTE_RCU)            += -lrte_rcu
-_LDLIBS-$(CONFIG_RTE_LIBRTE_GRAPH)          += -lrte_graph
-_LDLIBS-$(CONFIG_RTE_LIBRTE_NODE)           += -lrte_node
-
-ifeq ($(CONFIG_RTE_EXEC_ENV_LINUX),y)
-_LDLIBS-$(CONFIG_RTE_LIBRTE_KNI)            += -lrte_kni
-endif
-
-OTX-CPT-y := $(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_CRYPTO)
-OTX-CPT-y += $(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_CRYPTO)
-ifeq ($(findstring y,$(OTX-CPT-y)),y)
-_LDLIBS-y += -lrte_common_cpt
-endif
-
-ifeq ($(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_SSOVF)$(CONFIG_RTE_LIBRTE_OCTEONTX_MEMPOOL),yy)
-_LDLIBS-y += -lrte_common_octeontx
-endif
-OCTEONTX2-y := $(CONFIG_RTE_LIBRTE_OCTEONTX2_MEMPOOL)
-OCTEONTX2-y += $(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_CRYPTO)
-OCTEONTX2-y += $(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EVENTDEV)
-OCTEONTX2-y += $(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_DMA_RAWDEV)
-OCTEONTX2-y += $(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EP_RAWDEV)
-OCTEONTX2-y += $(CONFIG_RTE_LIBRTE_OCTEONTX2_PMD)
-ifeq ($(findstring y,$(OCTEONTX2-y)),y)
-_LDLIBS-y += -lrte_common_octeontx2
-endif
-
-MVEP-y := $(CONFIG_RTE_LIBRTE_MVPP2_PMD)
-MVEP-y += $(CONFIG_RTE_LIBRTE_MVNETA_PMD)
-MVEP-y += $(CONFIG_RTE_LIBRTE_PMD_MVSAM_CRYPTO)
-ifneq (,$(findstring y,$(MVEP-y)))
-_LDLIBS-y += -lrte_common_mvep -L$(LIBMUSDK_PATH)/lib -lmusdk
-endif
-
-DPAAX-y := $(CONFIG_RTE_LIBRTE_DPAA_BUS)
-DPAAX-y += $(CONFIG_RTE_LIBRTE_FSLMC_BUS)
-DPAAX-y += $(CONFIG_RTE_LIBRTE_ENETC_PMD)
-DPAAX-y += $(CONFIG_RTE_LIBRTE_PMD_CAAM_JR)
-DPAAX-y += $(CONFIG_RTE_LIBRTE_PFE_PMD)
-ifeq ($(findstring y,$(DPAAX-y)),y)
- _LDLIBS-y += -lrte_common_dpaax
-endif
-
-_LDLIBS-$(CONFIG_RTE_LIBRTE_PCI_BUS)        += -lrte_bus_pci
-_LDLIBS-$(CONFIG_RTE_LIBRTE_VDEV_BUS)       += -lrte_bus_vdev
-_LDLIBS-$(CONFIG_RTE_LIBRTE_DPAA_BUS)       += -lrte_bus_dpaa
-ifeq ($(CONFIG_RTE_EAL_VFIO),y)
-_LDLIBS-$(CONFIG_RTE_LIBRTE_FSLMC_BUS)      += -lrte_bus_fslmc
-endif
-
-ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),n)
-# plugins (link only if static libraries)
-
-_LDLIBS-$(CONFIG_RTE_DRIVER_MEMPOOL_BUCKET) += -lrte_mempool_bucket
-_LDLIBS-$(CONFIG_RTE_DRIVER_MEMPOOL_STACK)  += -lrte_mempool_stack
-ifeq ($(CONFIG_RTE_LIBRTE_DPAA_BUS),y)
-_LDLIBS-$(CONFIG_RTE_LIBRTE_DPAA_MEMPOOL)   += -lrte_mempool_dpaa
-endif
-ifeq ($(CONFIG_RTE_EAL_VFIO)$(CONFIG_RTE_LIBRTE_FSLMC_BUS),yy)
-_LDLIBS-$(CONFIG_RTE_LIBRTE_DPAA2_MEMPOOL)  += -lrte_mempool_dpaa2
-endif
-
-_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_AF_PACKET)  += -lrte_pmd_af_packet
-_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_AF_XDP)     += -lrte_pmd_af_xdp -lbpf
-_LDLIBS-$(CONFIG_RTE_LIBRTE_ARK_PMD)        += -lrte_pmd_ark
-_LDLIBS-$(CONFIG_RTE_LIBRTE_ATLANTIC_PMD)   += -lrte_pmd_atlantic
-_LDLIBS-$(CONFIG_RTE_LIBRTE_AVP_PMD)        += -lrte_pmd_avp
-_LDLIBS-$(CONFIG_RTE_LIBRTE_AXGBE_PMD)      += -lrte_pmd_axgbe
-_LDLIBS-$(CONFIG_RTE_LIBRTE_BNX2X_PMD)      += -lrte_pmd_bnx2x -lz
-_LDLIBS-$(CONFIG_RTE_LIBRTE_BNXT_PMD)       += -lrte_pmd_bnxt
-_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_BOND)       += -lrte_pmd_bond
-_LDLIBS-$(CONFIG_RTE_LIBRTE_CXGBE_PMD)      += -lrte_pmd_cxgbe
-ifeq ($(CONFIG_RTE_LIBRTE_DPAA_BUS),y)
-_LDLIBS-$(CONFIG_RTE_LIBRTE_DPAA_PMD)       += -lrte_pmd_dpaa
-endif
-ifeq ($(CONFIG_RTE_EAL_VFIO)$(CONFIG_RTE_LIBRTE_FSLMC_BUS),yy)
-_LDLIBS-$(CONFIG_RTE_LIBRTE_DPAA2_PMD)      += -lrte_pmd_dpaa2
-endif
-_LDLIBS-$(CONFIG_RTE_LIBRTE_E1000_PMD)      += -lrte_pmd_e1000
-_LDLIBS-$(CONFIG_RTE_LIBRTE_ENA_PMD)        += -lrte_pmd_ena
-_LDLIBS-$(CONFIG_RTE_LIBRTE_ENETC_PMD)      += -lrte_pmd_enetc
-_LDLIBS-$(CONFIG_RTE_LIBRTE_ENIC_PMD)       += -lrte_pmd_enic
-_LDLIBS-$(CONFIG_RTE_LIBRTE_FM10K_PMD)      += -lrte_pmd_fm10k
-_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_FAILSAFE)   += -lrte_pmd_failsafe
-_LDLIBS-$(CONFIG_RTE_LIBRTE_HINIC_PMD)      += -lrte_pmd_hinic
-_LDLIBS-$(CONFIG_RTE_LIBRTE_HNS3_PMD)       += -lrte_pmd_hns3
-_LDLIBS-$(CONFIG_RTE_LIBRTE_I40E_PMD)       += -lrte_pmd_i40e
-_LDLIBS-$(CONFIG_RTE_LIBRTE_IAVF_PMD)       += -lrte_pmd_iavf
-_LDLIBS-$(CONFIG_RTE_LIBRTE_ICE_PMD)        += -lrte_pmd_ice
-IAVF-y := $(CONFIG_RTE_LIBRTE_IAVF_PMD)
-IAVF-y += $(CONFIG_RTE_LIBRTE_ICE_PMD)
-ifeq ($(findstring y,$(IAVF-y)),y)
-_LDLIBS-y += -lrte_common_iavf
-endif
-_LDLIBS-$(CONFIG_RTE_LIBRTE_IGC_PMD)        += -lrte_pmd_igc
-_LDLIBS-$(CONFIG_RTE_LIBRTE_IONIC_PMD)      += -lrte_pmd_ionic
-_LDLIBS-$(CONFIG_RTE_LIBRTE_IXGBE_PMD)      += -lrte_pmd_ixgbe
-ifeq ($(CONFIG_RTE_LIBRTE_KNI),y)
-_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_KNI)        += -lrte_pmd_kni
-endif
-_LDLIBS-$(CONFIG_RTE_LIBRTE_LIO_PMD)        += -lrte_pmd_lio
-_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_MEMIF)      += -lrte_pmd_memif
-_LDLIBS-$(CONFIG_RTE_LIBRTE_MLX4_PMD)       += -lrte_pmd_mlx4
-ifeq ($(findstring y,$(CONFIG_RTE_LIBRTE_MLX5_PMD)$(CONFIG_RTE_LIBRTE_MLX5_VDPA_PMD)$(CONFIG_RTE_LIBRTE_MLX5_REGEX_PMD)),y)
-_LDLIBS-y                                   += -lrte_common_mlx5
-endif
-_LDLIBS-$(CONFIG_RTE_LIBRTE_MLX5_PMD)       += -lrte_pmd_mlx5
-_LDLIBS-$(CONFIG_RTE_LIBRTE_MLX5_VDPA_PMD)  += -lrte_pmd_mlx5_vdpa
-_LDLIBS-$(CONFIG_RTE_LIBRTE_MLX5_REGEX_PMD)  += -lrte_pmd_mlx5_regex
-ifeq ($(CONFIG_RTE_IBVERBS_LINK_DLOPEN),y)
-_LDLIBS-y                                   += -ldl
-else ifeq ($(CONFIG_RTE_IBVERBS_LINK_STATIC),y)
-LIBS_IBVERBS_STATIC = $(shell $(RTE_SDK)/buildtools/options-ibverbs-static.sh)
-_LDLIBS-y                                   += --no-whole-archive
-_LDLIBS-y                                   += $(LIBS_IBVERBS_STATIC)
-_LDLIBS-y                                   += --whole-archive
-else
-ifeq ($(findstring y,$(CONFIG_RTE_LIBRTE_MLX5_PMD)$(CONFIG_RTE_LIBRTE_MLX5_VDPA_PMD)$(CONFIG_RTE_LIBRTE_MLX5_REGEX_PMD)),y)
-_LDLIBS-y                                   += -libverbs -lmlx5
-endif
-_LDLIBS-$(CONFIG_RTE_LIBRTE_MLX4_PMD)       += -libverbs -lmlx4
-endif
-_LDLIBS-$(CONFIG_RTE_LIBRTE_MVPP2_PMD)      += -lrte_pmd_mvpp2
-_LDLIBS-$(CONFIG_RTE_LIBRTE_MVNETA_PMD)     += -lrte_pmd_mvneta
-_LDLIBS-$(CONFIG_RTE_LIBRTE_NFP_PMD)        += -lrte_pmd_nfp
-_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_NULL)       += -lrte_pmd_null
-_LDLIBS-$(CONFIG_RTE_LIBRTE_OCTEONTX2_PMD)  += -lrte_pmd_octeontx2 -lm
-_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_PCAP)       += -lrte_pmd_pcap -lpcap
-_LDLIBS-$(CONFIG_RTE_LIBRTE_PFE_PMD)        += -lrte_pmd_pfe
-_LDLIBS-$(CONFIG_RTE_LIBRTE_QEDE_PMD)       += -lrte_pmd_qede
-_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_RING)       += -lrte_pmd_ring
-ifeq ($(CONFIG_RTE_LIBRTE_SCHED),y)
-_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_SOFTNIC)      += -lrte_pmd_softnic
-endif
-_LDLIBS-$(CONFIG_RTE_LIBRTE_SFC_EFX_PMD)    += -lrte_pmd_sfc_efx
-_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_SZEDATA2)   += -lrte_pmd_szedata2 -lsze2
-_LDLIBS-$(CONFIG_RTE_LIBRTE_NFB_PMD)        += -lrte_pmd_nfb
-_LDLIBS-$(CONFIG_RTE_LIBRTE_NFB_PMD)        +=  $(shell command -v pkg-config > /dev/null 2>&1 && pkg-config --libs netcope-common)
-_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_TAP)        += -lrte_pmd_tap
-_LDLIBS-$(CONFIG_RTE_LIBRTE_THUNDERX_NICVF_PMD) += -lrte_pmd_thunderx_nicvf
-_LDLIBS-$(CONFIG_RTE_LIBRTE_VDEV_NETVSC_PMD) += -lrte_pmd_vdev_netvsc
-_LDLIBS-$(CONFIG_RTE_LIBRTE_VIRTIO_PMD)     += -lrte_pmd_virtio
-ifeq ($(CONFIG_RTE_LIBRTE_VHOST),y)
-_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_VHOST)      += -lrte_pmd_vhost
-ifeq ($(CONFIG_RTE_EAL_VFIO),y)
-_LDLIBS-$(CONFIG_RTE_LIBRTE_IFC_PMD) += -lrte_pmd_ifc
-endif # $(CONFIG_RTE_EAL_VFIO)
-endif # $(CONFIG_RTE_LIBRTE_VHOST)
-_LDLIBS-$(CONFIG_RTE_LIBRTE_VMXNET3_PMD)    += -lrte_pmd_vmxnet3_uio
-
-_LDLIBS-$(CONFIG_RTE_LIBRTE_VMBUS)          += -lrte_bus_vmbus
-_LDLIBS-$(CONFIG_RTE_LIBRTE_NETVSC_PMD)     += -lrte_pmd_netvsc
-
-ifeq ($(CONFIG_RTE_LIBRTE_BBDEV),y)
-_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_NULL)     += -lrte_pmd_bbdev_null
-_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_FPGA_LTE_FEC) += -lrte_pmd_bbdev_fpga_lte_fec
-_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_FPGA_5GNR_FEC) += -lrte_pmd_bbdev_fpga_5gnr_fec
-
-# TURBO SOFTWARE PMD is dependent on the FLEXRAN library
-_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_TURBO_SW) += -lrte_pmd_bbdev_turbo_sw
-ifeq ($(CONFIG_RTE_BBDEV_SDK_AVX2),y)
-# Dependency on the FLEXRAN SDK library if available
-_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_TURBO_SW) += -L$(FLEXRAN_SDK)/lib_crc -lcrc
-_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_TURBO_SW) += -L$(FLEXRAN_SDK)/lib_turbo -lturbo
-_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_TURBO_SW) += -L$(FLEXRAN_SDK)/lib_rate_matching -lrate_matching
-_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_TURBO_SW) += -L$(FLEXRAN_SDK)/lib_common -lcommon
-_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_TURBO_SW) += -lirc -limf -lstdc++ -lipps -lsvml
-ifeq ($(CONFIG_RTE_BBDEV_SDK_AVX512),y)
-_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_TURBO_SW) += -L$(FLEXRAN_SDK)/lib_LDPC_ratematch_5gnr -lLDPC_ratematch_5gnr
-_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_TURBO_SW) += -L$(FLEXRAN_SDK)/lib_ldpc_encoder_5gnr -lldpc_encoder_5gnr
-_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_TURBO_SW) += -L$(FLEXRAN_SDK)/lib_ldpc_decoder_5gnr -lldpc_decoder_5gnr
-_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_BBDEV_TURBO_SW) += -L$(FLEXRAN_SDK)/lib_rate_dematching_5gnr -lrate_dematching_5gnr
-endif # CONFIG_RTE_BBDEV_SDK_AVX512
-endif # CONFIG_RTE_BBDEV_SDK_AVX2
-endif # CONFIG_RTE_LIBRTE_BBDEV
-
-ifeq ($(CONFIG_RTE_LIBRTE_CRYPTODEV),y)
-_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_AESNI_MB)    += -lrte_pmd_aesni_mb
-_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_AESNI_MB)    += -lIPSec_MB
-_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_AESNI_GCM)   += -lrte_pmd_aesni_gcm
-_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_AESNI_GCM)   += -lIPSec_MB
-_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_CCP)         += -lrte_pmd_ccp -lcrypto
-_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_OPENSSL)     += -lrte_pmd_openssl -lcrypto
-_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_NULL_CRYPTO) += -lrte_pmd_null_crypto
-ifeq ($(CONFIG_RTE_LIBRTE_PMD_QAT),y)
-_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_QAT_SYM)     += -lrte_pmd_qat -lcrypto
-_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_QAT_ASYM)    += -lrte_pmd_qat -lcrypto
-endif # CONFIG_RTE_LIBRTE_PMD_QAT
-_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_SNOW3G)      += -lrte_pmd_snow3g
-_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_SNOW3G)      += -lIPSec_MB
-_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_KASUMI)      += -lrte_pmd_kasumi
-_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_KASUMI)      += -lIPSec_MB
-_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_ZUC)         += -lrte_pmd_zuc
-_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_ZUC)         += -lIPSec_MB
-_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_ARMV8_CRYPTO)    += -lrte_pmd_armv8
-_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_ARMV8_CRYPTO)    += -L$(ARMV8_CRYPTO_LIB_PATH) -lAArch64crypto
-_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_MVSAM_CRYPTO) += -L$(LIBMUSDK_PATH)/lib -lrte_pmd_mvsam_crypto -lmusdk
-_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_NITROX)      += -lrte_pmd_nitrox
-_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_CRYPTO) += -lrte_pmd_octeontx_crypto
-_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_CRYPTO) += -lrte_pmd_octeontx2_crypto
-_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_CRYPTO_SCHEDULER) += -lrte_pmd_crypto_scheduler
-ifeq ($(CONFIG_RTE_EAL_VFIO)$(CONFIG_RTE_LIBRTE_FSLMC_BUS),yy)
-_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_DPAA2_SEC)   += -lrte_pmd_dpaa2_sec
-endif # CONFIG_RTE_LIBRTE_FSLMC_BUS
-ifeq ($(CONFIG_RTE_LIBRTE_DPAA_BUS),y)
-_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_DPAA_SEC)   += -lrte_pmd_dpaa_sec
-endif # CONFIG_RTE_LIBRTE_DPAA_BUS
-ifeq ($(CONFIG_RTE_LIBRTE_SECURITY),y)
-_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_CAAM_JR)   += -lrte_pmd_caam_jr
-endif # CONFIG_RTE_LIBRTE_SECURITY
-_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_VIRTIO_CRYPTO) += -lrte_pmd_virtio_crypto
-endif # CONFIG_RTE_LIBRTE_CRYPTODEV
-
-ifeq ($(CONFIG_RTE_LIBRTE_COMPRESSDEV),y)
-_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_ISAL) += -lrte_pmd_isal_comp
-_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_ISAL) += -lisal
-_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_ZIPVF) += -lrte_pmd_octeontx_zip
-# Link QAT driver if it has not been linked yet
-ifeq ($(CONFIG_RTE_LIBRTE_PMD_QAT_SYM),n)
-_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_QAT)  += -lrte_pmd_qat
-endif # CONFIG_RTE_LIBRTE_PMD_QAT_SYM
-_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_ZLIB) += -lrte_pmd_zlib
-_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_ZLIB) += -lz
-endif # CONFIG_RTE_LIBRTE_COMPRESSDEV
-
-ifeq ($(CONFIG_RTE_LIBRTE_EVENTDEV),y)
-_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_SKELETON_EVENTDEV) += -lrte_pmd_skeleton_event
-_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_SW_EVENTDEV) += -lrte_pmd_sw_event
-_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_DSW_EVENTDEV) += -lrte_pmd_dsw_event
-_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_SSOVF) += -lrte_pmd_octeontx_ssovf
-ifeq ($(CONFIG_RTE_LIBRTE_DPAA_BUS),y)
-_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_DPAA_EVENTDEV) += -lrte_pmd_dpaa_event
-endif # CONFIG_RTE_LIBRTE_DPAA_BUS
-ifeq ($(CONFIG_RTE_EAL_VFIO)$(CONFIG_RTE_LIBRTE_FSLMC_BUS),yy)
-_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_DPAA2_EVENTDEV) += -lrte_pmd_dpaa2_event
-endif # CONFIG_RTE_LIBRTE_FSLMC_BUS
-
-_LDLIBS-$(CONFIG_RTE_LIBRTE_OCTEONTX_MEMPOOL) += -lrte_mempool_octeontx
-_LDLIBS-$(CONFIG_RTE_LIBRTE_OCTEONTX_PMD) += -lrte_pmd_octeontx
-_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EVENTDEV) += -lrte_pmd_octeontx2_event
-_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_OPDL_EVENTDEV) += -lrte_pmd_opdl_event
-endif # CONFIG_RTE_LIBRTE_EVENTDEV
-
-ifeq ($(CONFIG_RTE_LIBRTE_RAWDEV),y)
-_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_SKELETON_RAWDEV) += -lrte_rawdev_skeleton
-ifeq ($(CONFIG_RTE_EAL_VFIO)$(CONFIG_RTE_LIBRTE_FSLMC_BUS),yy)
-_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_DPAA2_CMDIF_RAWDEV) += -lrte_rawdev_dpaa2_cmdif
-_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_DPAA2_QDMA_RAWDEV) += -lrte_rawdev_dpaa2_qdma
-endif # CONFIG_RTE_LIBRTE_FSLMC_BUS
-_LDLIBS-$(CONFIG_RTE_LIBRTE_IFPGA_BUS)      += -lrte_bus_ifpga
-ifeq ($(CONFIG_RTE_LIBRTE_IFPGA_BUS),y)
-_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_IFPGA_RAWDEV)   += -lrte_rawdev_ifpga -lfdt
-_LDLIBS-$(CONFIG_RTE_LIBRTE_IPN3KE_PMD)       += -lrte_pmd_ipn3ke
-endif # CONFIG_RTE_LIBRTE_IFPGA_BUS
-_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_IOAT_RAWDEV)   += -lrte_rawdev_ioat
-_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_NTB_RAWDEV) += -lrte_rawdev_ntb
-_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_DMA_RAWDEV) += -lrte_rawdev_octeontx2_dma
-_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EP_RAWDEV) += -lrte_rawdev_octeontx2_ep
-endif # CONFIG_RTE_LIBRTE_RAWDEV
-
-endif # !CONFIG_RTE_BUILD_SHARED_LIBS
-
-_LDLIBS-y += --no-whole-archive
-
-ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),n)
-# The static libraries do not know their dependencies.
-# So linking with static library requires explicit dependencies.
-_LDLIBS-$(CONFIG_RTE_LIBRTE_EAL)            += -lrt
-ifeq ($(CONFIG_RTE_EXEC_ENV_LINUX)$(CONFIG_RTE_EAL_NUMA_AWARE_HUGEPAGES),yy)
-_LDLIBS-$(CONFIG_RTE_LIBRTE_EAL)            += -lnuma
-endif
-_LDLIBS-$(CONFIG_RTE_LIBRTE_SCHED)          += -lm
-_LDLIBS-$(CONFIG_RTE_LIBRTE_SCHED)          += -lrt
-_LDLIBS-$(CONFIG_RTE_LIBRTE_MEMBER)         += -lm
-_LDLIBS-$(CONFIG_RTE_LIBRTE_METER)          += -lm
-ifeq ($(CONFIG_RTE_LIBRTE_VHOST_NUMA),y)
-_LDLIBS-$(CONFIG_RTE_LIBRTE_VHOST)          += -lnuma
-endif
-_LDLIBS-$(CONFIG_RTE_PORT_PCAP)             += -lpcap
-endif # !CONFIG_RTE_BUILD_SHARED_LIBS
-
-_LDLIBS-y += $(EXECENV_LDLIBS)
-
-LDLIBS += $(_LDLIBS-y) $(CPU_LDLIBS) $(EXTRA_LDLIBS)
-
-# all the words except the first one
-allbutfirst = $(wordlist 2,$(words $(1)),$(1))
-
-# Eliminate duplicates without sorting, only keep the last occurrence
-filter-libs = \
-	$(if $(1),$(strip\
-		$(if \
-			$(and \
-				$(filter $(firstword $(1)),$(call allbutfirst,$(1))),\
-				$(filter -l%,$(firstword $(1)))),\
-			,\
-			$(firstword $(1))) \
-		$(call filter-libs,$(call allbutfirst,$(1)))))
-
-LDLIBS := $(call filter-libs,$(LDLIBS))
-
-MAPFLAGS = -Map=$@.map --cref
-
-.PHONY: all
-all: install
-
-.PHONY: install
-install: build _postinstall
-
-_postinstall: build
-
-.PHONY: build
-build: _postbuild
-
-exe2cmd = $(strip $(call dotfile,$(patsubst %,%.cmd,$(1))))
-
-ifeq ($(LINK_USING_CC),1)
-O_TO_EXE = $(CC) -o $@ $(CFLAGS) $(EXTRA_CFLAGS) $(OBJS-y) $(call linkerprefix, \
-	$(LDLIBS) $(LDFLAGS) $(LDFLAGS_$(@)) $(EXTRA_LDFLAGS) \
-	$(MAPFLAGS))
-else
-O_TO_EXE = $(LD) -o $@ $(OBJS-y) \
-	$(LDLIBS) $(LDFLAGS) $(LDFLAGS_$(@)) $(EXTRA_LDFLAGS) \
-	$(MAPFLAGS)
-endif
-O_TO_EXE_STR = $(subst ','\'',$(O_TO_EXE)) #'# fix syntax highlight
-O_TO_EXE_DISP = $(if $(V),"$(O_TO_EXE_STR)","  LD $(@)")
-O_TO_EXE_CMD = "cmd_$@ = $(O_TO_EXE_STR)"
-O_TO_EXE_DO = @set -e; \
-	echo $(O_TO_EXE_DISP); \
-	$(O_TO_EXE) && \
-	echo $(O_TO_EXE_CMD) > $(call exe2cmd,$(@))
-
--include .$(APP).cmd
-
-# path where libraries are retrieved
-LDLIBS_PATH := $(subst -Wl$(comma)-L,,$(filter -Wl$(comma)-L%,$(LDLIBS)))
-LDLIBS_PATH += $(subst -L,,$(filter -L%,$(LDLIBS)))
-
-# list of .a files that are linked to this application
-LDLIBS_NAMES := $(patsubst -l%,lib%.a,$(filter -l%,$(LDLIBS)))
-LDLIBS_NAMES += $(patsubst -Wl$(comma)-l%,lib%.a,$(filter -Wl$(comma)-l%,$(LDLIBS)))
-
-# list of found libraries files (useful for deps). If not found, the
-# library is silently ignored and dep won't be checked
-LDLIBS_FILES := $(sort $(wildcard $(foreach dir,$(LDLIBS_PATH),\
-	$(addprefix $(dir)/,$(LDLIBS_NAMES)))))
-
-#
-# Compile executable file if needed
-#
-$(APP): $(OBJS-y) $(LDLIBS_FILES) $(DEP_$(APP)) $(LDSCRIPT) FORCE
-	@[ -d $(dir $@) ] || mkdir -p $(dir $@)
-	$(if $(D),\
-		@echo -n "$< -> $@ " ; \
-		echo -n "file_missing=$(call boolean,$(file_missing)) " ; \
-		echo -n "cmdline_changed=$(call boolean,$(call cmdline_changed,$(O_TO_EXE_STR))) " ; \
-		echo -n "depfile_missing=$(call boolean,$(depfile_missing)) " ; \
-		echo "depfile_newer=$(call boolean,$(depfile_newer)) ")
-	$(if $(or \
-		$(file_missing),\
-		$(call cmdline_changed,$(O_TO_EXE_STR)),\
-		$(depfile_missing),\
-		$(depfile_newer)),\
-		$(O_TO_EXE_DO))
-
-#
-# install app in $(RTE_OUTPUT)/app
-#
-$(RTE_OUTPUT)/app/$(APP): $(APP)
-	@echo "  INSTALL-APP $(APP)"
-	@[ -d $(RTE_OUTPUT)/app ] || mkdir -p $(RTE_OUTPUT)/app
-	$(Q)cp -f $(APP) $(RTE_OUTPUT)/app
-
-#
-# install app map file in $(RTE_OUTPUT)/app
-#
-$(RTE_OUTPUT)/app/$(APP).map: $(APP)
-	@echo "  INSTALL-MAP $(APP).map"
-	@[ -d $(RTE_OUTPUT)/app ] || mkdir -p $(RTE_OUTPUT)/app
-	$(Q)cp -f $(APP).map $(RTE_OUTPUT)/app
-
-#
-# Clean all generated files
-#
-.PHONY: clean
-clean: _postclean
-	$(Q)rm -f $(_BUILD_TARGETS) $(_INSTALL_TARGETS) $(_CLEAN_TARGETS)
-
-.PHONY: doclean
-doclean:
-	$(Q)rm -rf $(APP) $(OBJS-all) $(DEPS-all) $(DEPSTMP-all) \
-	  $(CMDS-all) $(INSTALL-FILES-all) .$(APP).cmd $(APP).map
-
-
-include $(RTE_SDK)/mk/internal/rte.compile-post.mk
-include $(RTE_SDK)/mk/internal/rte.install-post.mk
-include $(RTE_SDK)/mk/internal/rte.clean-post.mk
-include $(RTE_SDK)/mk/internal/rte.build-post.mk
-
-ifneq ($(wildcard $(RTE_SDK)/mk/target/$(RTE_TARGET)/rte.app.mk),)
-include $(RTE_SDK)/mk/target/$(RTE_TARGET)/rte.app.mk
-else
-include $(RTE_SDK)/mk/target/generic/rte.app.mk
-endif
-
-.PHONY: FORCE
-FORCE:
diff --git a/mk/rte.bsdmodule.mk b/mk/rte.bsdmodule.mk
deleted file mode 100644
index df8bf9ef35..0000000000
--- a/mk/rte.bsdmodule.mk
+++ /dev/null
@@ -1,89 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-##### if sourced from kernel Kbuild system
-ifneq ($(KERNELRELEASE),)
-override EXTRA_CFLAGS = $(MODULE_CFLAGS) $(EXTRA_KERNEL_CFLAGS)
-obj-m          += $(MODULE).o
-ifneq ($(MODULE),$(notdir $(SRCS-y:%.c=%)))
-$(MODULE)-objs += $(notdir $(SRCS-y:%.c=%.o))
-endif
-
-##### if launched from rte build system
-else
-
-include $(RTE_SDK)/mk/internal/rte.install-pre.mk
-include $(RTE_SDK)/mk/internal/rte.clean-pre.mk
-include $(RTE_SDK)/mk/internal/rte.build-pre.mk
-
-# DPDK uses a more up-to-date gcc, so clear the override here.
-unexport CC
-override CFLAGS = $(MODULE_CFLAGS)
-
-# VPATH contains at least SRCDIR
-VPATH += $(SRCDIR)
-
-_BUILD = $(MODULE).ko
-_INSTALL = $(INSTALL-FILES-y) $(SYMLINK-FILES-y) \
-	$(RTE_OUTPUT)/kmod/$(MODULE).ko
-_CLEAN = doclean
-
-SRCS_LINKS = $(addsuffix _link,$(SRCS-y))
-
-compare = $(strip $(subst $(1),,$(2)) $(subst $(2),,$(1)))
-
-.PHONY: all
-all: install
-
-.PHONY: install
-install: build _postinstall
-
-_postinstall: build
-
-.PHONY: build
-build: _postbuild
-
-# Link all sources in build directory
-%_link: FORCE
-	$(if $(call compare,$(notdir $*),$*),\
-	$(Q)if [ ! -f $(notdir $(*)) ]; then ln -nfs $(SRCDIR)/$(*) . ; fi,\
-	$(Q)if [ ! -f $(notdir $(*)) ]; then ln -nfs $(SRCDIR)/$(*) . ; fi)
-
-# build module
-$(MODULE).ko: $(SRCS_LINKS)
-	$(Q)if [ ! -f $(notdir Makefile) ]; then ln -nfs $(SRCDIR)/Makefile . ; fi
-	$(Q)if [ ! -f $(notdir BSDmakefile) ]; then ln -nfs $(SRCDIR)/BSDmakefile . ; fi
-	$(Q)MAKEFLAGS= $(BSDMAKE)
-
-# install module in $(RTE_OUTPUT)/kmod
-$(RTE_OUTPUT)/kmod/$(MODULE).ko: $(MODULE).ko
-	$(Q)echo INSTALL-MODULE $(MODULE).ko
-	$(Q)[ -d $(RTE_OUTPUT)/kmod ] || mkdir -p $(RTE_OUTPUT)/kmod
-	$(Q)cp -f $(MODULE).ko $(RTE_OUTPUT)/kmod
-
-# install module
-modules_install:
-	$(Q)MAKEFLAGS= $(BSDMAKE) install
-
-.PHONY: clean
-clean: _postclean
-
-# do a make clean and remove links
-.PHONY: doclean
-doclean:
-	$(Q)if [ ! -f $(notdir Makefile) ]; then ln -nfs $(SRCDIR)/Makefile . ; fi
-	$(Q)$(MAKE) -C $(RTE_KERNELDIR) M=$(CURDIR) O=$(RTE_KERNELDIR) clean
-	$(Q)$(foreach FILE,$(SRCS-y) $(SRCS-n) $(SRCS-),\
-		if [ -h $(notdir $(FILE)) ]; then rm -f $(notdir $(FILE)) ; fi ;)
-	$(Q)if [ -h $(notdir Makefile) ]; then rm -f $(notdir Makefile) ; fi
-	$(Q)rm -f $(_BUILD_TARGETS) $(_INSTALL_TARGETS) $(_CLEAN_TARGETS) \
-		$(INSTALL-FILES-all)
-
-include $(RTE_SDK)/mk/internal/rte.install-post.mk
-include $(RTE_SDK)/mk/internal/rte.clean-post.mk
-include $(RTE_SDK)/mk/internal/rte.build-post.mk
-
-.PHONY: FORCE
-FORCE:
-
-endif
diff --git a/mk/rte.combinedlib.mk b/mk/rte.combinedlib.mk
deleted file mode 100644
index 9d0f935358..0000000000
--- a/mk/rte.combinedlib.mk
+++ /dev/null
@@ -1,30 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2015 Intel Corporation
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-default: all
-
-ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y)
-EXT:=.so
-else
-EXT:=.a
-endif
-
-RTE_LIBNAME := dpdk
-COMBINEDLIB := lib$(RTE_LIBNAME)$(EXT)
-
-LIBS := $(filter-out $(COMBINEDLIB), $(sort $(notdir $(wildcard $(RTE_OUTPUT)/lib/*$(EXT)))))
-
-all: FORCE
-	$(Q)echo "GROUP ( $(LIBS) )" > $(RTE_OUTPUT)/lib/$(COMBINEDLIB)
-
-#
-# Clean all generated files
-#
-.PHONY: clean
-clean:
-	$(Q)rm -f $(RTE_OUTPUT)/lib/$(COMBINEDLIB)
-
-.PHONY: FORCE
-FORCE:
diff --git a/mk/rte.cpuflags.mk b/mk/rte.cpuflags.mk
deleted file mode 100644
index fa87535312..0000000000
--- a/mk/rte.cpuflags.mk
+++ /dev/null
@@ -1,124 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-# this makefile is called from the generic rte.vars.mk and is
-# used to set the RTE_CPUFLAG_* environment variables giving details
-# of what instruction sets the target cpu supports.
-
-AUTO_CPUFLAGS := $(shell $(CC) $(MACHINE_CFLAGS) $(WERROR_FLAGS) $(EXTRA_CFLAGS) -dM -E - < /dev/null)
-
-# adding flags to CPUFLAGS
-
-ifneq ($(filter $(AUTO_CPUFLAGS),__SSE__),)
-CPUFLAGS += SSE
-endif
-
-ifneq ($(filter $(AUTO_CPUFLAGS),__SSE2__),)
-CPUFLAGS += SSE2
-endif
-
-ifneq ($(filter $(AUTO_CPUFLAGS),__SSE3__),)
-CPUFLAGS += SSE3
-endif
-
-ifneq ($(filter $(AUTO_CPUFLAGS),__SSSE3__),)
-CPUFLAGS += SSSE3
-endif
-
-ifneq ($(filter $(AUTO_CPUFLAGS),__SSE4_1__),)
-CPUFLAGS += SSE4_1
-endif
-
-ifneq ($(filter $(AUTO_CPUFLAGS),__SSE4_2__),)
-CPUFLAGS += SSE4_2
-endif
-
-ifneq ($(filter $(AUTO_CPUFLAGS),__AES__),)
-CPUFLAGS += AES
-endif
-
-ifneq ($(filter $(AUTO_CPUFLAGS),__PCLMUL__),)
-CPUFLAGS += PCLMULQDQ
-endif
-
-ifneq ($(filter $(AUTO_CPUFLAGS),__AVX__),)
-ifeq ($(CONFIG_RTE_ENABLE_AVX),y)
-CPUFLAGS += AVX
-endif
-endif
-
-ifneq ($(filter $(AUTO_CPUFLAGS),__RDRND__),)
-CPUFLAGS += RDRAND
-endif
-
-ifneq ($(filter $(AUTO_CPUFLAGS),__RDSEED__),)
-CPUFLAGS += RDSEED
-endif
-
-ifneq ($(filter $(AUTO_CPUFLAGS),__FSGSBASE__),)
-CPUFLAGS += FSGSBASE
-endif
-
-ifneq ($(filter $(AUTO_CPUFLAGS),__F16C__),)
-CPUFLAGS += F16C
-endif
-
-ifneq ($(filter $(AUTO_CPUFLAGS),__AVX2__),)
-ifeq ($(CONFIG_RTE_ENABLE_AVX),y)
-CPUFLAGS += AVX2
-endif
-endif
-
-ifneq ($(filter $(AUTO_CPUFLAGS),__AVX512F__),)
-ifeq ($(CONFIG_RTE_ENABLE_AVX512),y)
-CPUFLAGS += AVX512F
-else
-# disable AVX512F support for GCC & binutils 2.30 as a workaround for Bug 97
-ifeq ($(FORCE_DISABLE_AVX512),y)
-MACHINE_CFLAGS += -mno-avx512f
-endif
-endif
-endif
-
-# IBM Power CPU flags
-ifneq ($(filter $(AUTO_CPUFLAGS),__PPC64__),)
-CPUFLAGS += PPC64
-endif
-
-ifneq ($(filter $(AUTO_CPUFLAGS),__PPC32__),)
-CPUFLAGS += PPC32
-endif
-
-ifneq ($(filter $(AUTO_CPUFLAGS),__vector),)
-CPUFLAGS += ALTIVEC
-endif
-
-ifneq ($(filter $(AUTO_CPUFLAGS),__builtin_vsx_xvnmaddadp),)
-CPUFLAGS += VSX
-endif
-
-# ARM flags
-ifneq ($(filter __ARM_NEON __aarch64__,$(AUTO_CPUFLAGS)),)
-CPUFLAGS += NEON
-endif
-
-ifneq ($(filter $(AUTO_CPUFLAGS),__ARM_FEATURE_CRC32),)
-CPUFLAGS += CRC32
-endif
-
-ifneq ($(filter $(AUTO_CPUFLAGS),__ARM_FEATURE_CRYPTO),)
-CPUFLAGS += AES
-CPUFLAGS += PMULL
-CPUFLAGS += SHA1
-CPUFLAGS += SHA2
-endif
-
-MACHINE_CFLAGS += $(addprefix -DRTE_MACHINE_CPUFLAG_,$(CPUFLAGS))
-
-# To strip whitespace
-comma:= ,
-empty:=
-space:= $(empty) $(empty)
-CPUFLAGSTMP1 := $(addprefix RTE_CPUFLAG_,$(CPUFLAGS))
-CPUFLAGSTMP2 := $(subst $(space),$(comma),$(CPUFLAGSTMP1))
-CPUFLAGS_LIST := -DRTE_COMPILE_TIME_CPUFLAGS=$(CPUFLAGSTMP2)
diff --git a/mk/rte.extapp.mk b/mk/rte.extapp.mk
deleted file mode 100644
index 427bb52306..0000000000
--- a/mk/rte.extapp.mk
+++ /dev/null
@@ -1,24 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-MAKEFLAGS += --no-print-directory
-
-# we must create the output dir first and recall the same Makefile
-# from this directory
-ifeq ($(NOT_FIRST_CALL),)
-
-NOT_FIRST_CALL = 1
-export NOT_FIRST_CALL
-
-all:
-	$(Q)mkdir -p $(RTE_OUTPUT)
-	$(Q)$(MAKE) -C $(RTE_OUTPUT) -f $(RTE_EXTMK) \
-		S=$(RTE_SRCDIR) O=$(RTE_OUTPUT) SRCDIR=$(RTE_SRCDIR)
-
-%::
-	$(Q)mkdir -p $(RTE_OUTPUT)
-	$(Q)$(MAKE) -C $(RTE_OUTPUT) -f $(RTE_EXTMK) $@ \
-		S=$(RTE_SRCDIR) O=$(RTE_OUTPUT) SRCDIR=$(RTE_SRCDIR)
-else
-include $(RTE_SDK)/mk/rte.app.mk
-endif
diff --git a/mk/rte.extlib.mk b/mk/rte.extlib.mk
deleted file mode 100644
index 977873325d..0000000000
--- a/mk/rte.extlib.mk
+++ /dev/null
@@ -1,26 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-MAKEFLAGS += --no-print-directory
-
-EXTLIB_BUILD := y
-
-# we must create the output dir first and recall the same Makefile
-# from this directory
-ifeq ($(NOT_FIRST_CALL),)
-
-NOT_FIRST_CALL = 1
-export NOT_FIRST_CALL
-
-all:
-	$(Q)mkdir -p $(RTE_OUTPUT)
-	$(Q)$(MAKE) -C $(RTE_OUTPUT) -f $(RTE_EXTMK) \
-		S=$(RTE_SRCDIR) O=$(RTE_OUTPUT) SRCDIR=$(RTE_SRCDIR)
-
-%::
-	$(Q)mkdir -p $(RTE_OUTPUT)
-	$(Q)$(MAKE) -C $(RTE_OUTPUT) -f $(RTE_EXTMK) $@ \
-		S=$(RTE_SRCDIR) O=$(RTE_OUTPUT) SRCDIR=$(RTE_SRCDIR)
-else
-include $(RTE_SDK)/mk/rte.lib.mk
-endif
diff --git a/mk/rte.extobj.mk b/mk/rte.extobj.mk
deleted file mode 100644
index c761a5de1e..0000000000
--- a/mk/rte.extobj.mk
+++ /dev/null
@@ -1,24 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-MAKEFLAGS += --no-print-directory
-
-# we must create the output dir first and recall the same Makefile
-# from this directory
-ifeq ($(NOT_FIRST_CALL),)
-
-NOT_FIRST_CALL = 1
-export NOT_FIRST_CALL
-
-all:
-	$(Q)mkdir -p $(RTE_OUTPUT)
-	$(Q)$(MAKE) -C $(RTE_OUTPUT) -f $(RTE_EXTMK) \
-		S=$(RTE_SRCDIR) O=$(RTE_OUTPUT) SRCDIR=$(RTE_SRCDIR)
-
-%::
-	$(Q)mkdir -p $(RTE_OUTPUT)
-	$(Q)$(MAKE) -C $(RTE_OUTPUT) -f $(RTE_EXTMK) $@ \
-		S=$(RTE_SRCDIR) O=$(RTE_OUTPUT) SRCDIR=$(RTE_SRCDIR)
-else
-include $(RTE_SDK)/mk/rte.obj.mk
-endif
diff --git a/mk/rte.extshared.mk b/mk/rte.extshared.mk
deleted file mode 100644
index 64269e1a85..0000000000
--- a/mk/rte.extshared.mk
+++ /dev/null
@@ -1,26 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2012-2013 6WIND S.A.
-
-MAKEFLAGS += --no-print-directory
-
-# we must create the output dir first and recall the same Makefile
-# from this directory
-ifeq ($(NOT_FIRST_CALL),)
-
-NOT_FIRST_CALL = 1
-export NOT_FIRST_CALL
-
-all:
-	$(Q)mkdir -p $(RTE_OUTPUT)
-	$(Q)$(MAKE) -C $(RTE_OUTPUT) -f $(RTE_EXTMK) \
-		S=$(RTE_SRCDIR) O=$(RTE_OUTPUT) SRCDIR=$(RTE_SRCDIR)
-	@echo $(RTE_OUTPUT)/lib must be added to /etc/ld.so.conf or \
-		LD_LIBRARY_PATH variable to allow binary to link with dynamic library
-
-%::
-	$(Q)mkdir -p $(RTE_OUTPUT)
-	$(Q)$(MAKE) -C $(RTE_OUTPUT) -f $(RTE_EXTMK) $@ \
-		S=$(RTE_SRCDIR) O=$(RTE_OUTPUT) SRCDIR=$(RTE_SRCDIR)
-else
-include $(RTE_SDK)/mk/rte.shared.mk
-endif
diff --git a/mk/rte.extsubdir.mk b/mk/rte.extsubdir.mk
deleted file mode 100644
index 0f8ef94c50..0000000000
--- a/mk/rte.extsubdir.mk
+++ /dev/null
@@ -1,39 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2014 6WIND S.A.
-
-MAKEFLAGS += --no-print-directory
-
-ALL_DEPDIRS := $(patsubst DEPDIRS-%,%,$(filter DEPDIRS-%,$(.VARIABLES)))
-
-# output directory
-O ?= $(CURDIR)
-BASE_OUTPUT ?= $(abspath $(O))
-CUR_SUBDIR ?= .
-
-.PHONY: all
-all: $(DIRS-y)
-
-.PHONY: clean
-clean: $(DIRS-y)
-
-.PHONY: $(DIRS-y)
-$(DIRS-y):
-	@echo "== $@"
-	$(Q)$(MAKE) -C $(@) \
-		M=$(CURDIR)/$(@)/Makefile \
-		O=$(BASE_OUTPUT)/$(CUR_SUBDIR)/$(@)/$(RTE_TARGET) \
-		BASE_OUTPUT=$(BASE_OUTPUT) \
-		CUR_SUBDIR=$(CUR_SUBDIR)/$(@) \
-		S=$(CURDIR)/$(@) \
-		$(filter-out $(DIRS-y),$(MAKECMDGOALS))
-
-define depdirs_rule
-$(DEPDIRS-$(1)):
-
-$(1): | $(DEPDIRS-$(1))
-
-$(if $(D),$(info $(1) depends on $(DEPDIRS-$(1))))
-endef
-
-$(foreach dir,$(ALL_DEPDIRS),\
-	$(eval $(call depdirs_rule,$(dir))))
diff --git a/mk/rte.gnuconfigure.mk b/mk/rte.gnuconfigure.mk
deleted file mode 100644
index 72e99aafc3..0000000000
--- a/mk/rte.gnuconfigure.mk
+++ /dev/null
@@ -1,44 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-include $(RTE_SDK)/mk/internal/rte.build-pre.mk
-include $(RTE_SDK)/mk/internal/rte.install-pre.mk
-include $(RTE_SDK)/mk/internal/rte.clean-pre.mk
-
-# VPATH contains at least SRCDIR
-VPATH += $(SRCDIR)
-_BUILD = configure
-_INSTALL = $(INSTALL-FILES-y) $(SYMLINK-FILES-y)
-_CLEAN = doclean
-
-.PHONY: all
-all: install
-
-.PHONY: install
-install: build _postinstall
-
-_postinstall: build
-
-.PHONY: build
-build: _postbuild
-
-configure:
-	$(Q)cd $(CONFIGURE_PATH) ; \
-	./configure --prefix $(CONFIGURE_PREFIX) $(CONFIGURE_ARGS) ; \
-	make ; \
-	make install
-
-.PHONY: clean
-clean: _postclean
-
-.PHONY: doclean
-doclean:
-	$(Q)cd $(CONFIGURE_PATH) ; make clean
-	$(Q)rm -f $(_INSTALL_TARGETS) $(_CLEAN_TARGETS)
-
-include $(RTE_SDK)/mk/internal/rte.build-post.mk
-include $(RTE_SDK)/mk/internal/rte.install-post.mk
-include $(RTE_SDK)/mk/internal/rte.clean-post.mk
-
-.PHONY: FORCE
-FORCE:
diff --git a/mk/rte.helper.mk b/mk/rte.helper.mk
deleted file mode 100644
index 6e7fd03d7f..0000000000
--- a/mk/rte.helper.mk
+++ /dev/null
@@ -1,10 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2018 Marvell International Ltd
-
-# rte_cc_has_argument
-# Usage: MACHINE_CFLAGS += $(call rte_cc_has_argument, -mno-avx512f)
-# Return the argument if the argument is supported by the compiler.
-#
-define rte_cc_has_argument
-	$(shell $(CC) -E $(1) -xc /dev/null 1>/dev/null 2>/dev/null && echo $(1))
-endef
diff --git a/mk/rte.hostapp.mk b/mk/rte.hostapp.mk
deleted file mode 100644
index 68e32b5780..0000000000
--- a/mk/rte.hostapp.mk
+++ /dev/null
@@ -1,93 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-# tell rte.compile-pre.mk to use HOSTCC instead of CC
-USE_HOST := 1
-include $(RTE_SDK)/mk/internal/rte.compile-pre.mk
-include $(RTE_SDK)/mk/internal/rte.install-pre.mk
-include $(RTE_SDK)/mk/internal/rte.clean-pre.mk
-include $(RTE_SDK)/mk/internal/rte.build-pre.mk
-
-# VPATH contains at least SRCDIR
-VPATH += $(SRCDIR)
-
-_BUILD = $(HOSTAPP)
-_INSTALL = $(INSTALL-FILES-y) $(SYMLINK-FILES-y) $(RTE_OUTPUT)/app/$(HOSTAPP)
-_CLEAN = doclean
-
-.PHONY: all
-all: install
-
-.PHONY: install
-install: build _postinstall
-
-_postinstall: build
-
-.PHONY: build
-build: _postbuild
-
-exe2cmd = $(strip $(call dotfile,$(patsubst %,%.cmd,$(1))))
-
-O_TO_EXE = $(HOSTCC) $(HOST_LDFLAGS) $(LDFLAGS_$(@)) \
-	$(EXTRA_HOST_LDFLAGS) -o $@ $(OBJS-y) $(LDLIBS)
-O_TO_EXE_STR = $(subst ','\'',$(O_TO_EXE)) #'# fix syntax highlight
-O_TO_EXE_DISP = $(if $(V),"$(O_TO_EXE_STR)","  HOSTLD $(@)")
-O_TO_EXE_CMD = "cmd_$@ = $(O_TO_EXE_STR)"
-O_TO_EXE_DO = @set -e; \
-	echo $(O_TO_EXE_DISP); \
-	$(O_TO_EXE) && \
-	echo $(O_TO_EXE_CMD) > $(call exe2cmd,$(@))
-
--include .$(HOSTAPP).cmd
-
-# list of .a files that are linked to this application
-LDLIBS_FILES := $(sort $(wildcard \
-	$(addprefix $(RTE_OUTPUT)/lib/, \
-	$(patsubst -l%,lib%.a,$(filter -l%,$(LDLIBS))))))
-
-#
-# Compile executable file if needed
-#
-$(HOSTAPP): $(OBJS-y) $(LDLIBS_FILES) FORCE
-	@[ -d $(dir $@) ] || mkdir -p $(dir $@)
-	$(if $(D),\
-		@echo -n "$@ -> $< " ; \
-		echo -n "file_missing=$(call boolean,$(file_missing)) " ; \
-		echo -n "cmdline_changed=$(call boolean,$(call cmdline_changed,$(O_TO_EXE_STR))) " ; \
-		echo -n "depfile_missing=$(call boolean,$(depfile_missing)) " ; \
-		echo "depfile_newer=$(call boolean,$(depfile_newer)) ")
-	$(if $(or \
-		$(file_missing),\
-		$(call cmdline_changed,$(O_TO_EXE_STR)),\
-		$(depfile_missing),\
-		$(depfile_newer)),\
-		$(O_TO_EXE_DO))
-
-#
-# install app in $(RTE_OUTPUT)/hostapp
-#
-$(RTE_OUTPUT)/app/$(HOSTAPP): $(HOSTAPP)
-	@echo "  INSTALL-HOSTAPP $(HOSTAPP)"
-	@[ -d $(RTE_OUTPUT)/app ] || mkdir -p $(RTE_OUTPUT)/app
-	$(Q)cp -f $(HOSTAPP) $(RTE_OUTPUT)/app
-
-#
-# Clean all generated files
-#
-.PHONY: clean
-clean: _postclean
-	$(Q)rm -f $(_BUILD_TARGETS) $(_INSTALL_TARGETS) $(_CLEAN_TARGETS)
-
-.PHONY: doclean
-doclean:
-	$(Q)rm -rf $(HOSTAPP) $(OBJS-all) $(DEPS-all) $(DEPSTMP-all) \
-	  $(CMDS-all) $(INSTALL-FILES-all) .$(HOSTAPP).cmd
-
-
-include $(RTE_SDK)/mk/internal/rte.compile-post.mk
-include $(RTE_SDK)/mk/internal/rte.install-post.mk
-include $(RTE_SDK)/mk/internal/rte.clean-post.mk
-include $(RTE_SDK)/mk/internal/rte.build-post.mk
-
-.PHONY: FORCE
-FORCE:
diff --git a/mk/rte.hostlib.mk b/mk/rte.hostlib.mk
deleted file mode 100644
index 0ccaa55f09..0000000000
--- a/mk/rte.hostlib.mk
+++ /dev/null
@@ -1,86 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-# tell rte.compile-pre.mk to use HOSTCC instead of CC
-USE_HOST := 1
-include $(RTE_SDK)/mk/internal/rte.compile-pre.mk
-include $(RTE_SDK)/mk/internal/rte.install-pre.mk
-include $(RTE_SDK)/mk/internal/rte.clean-pre.mk
-include $(RTE_SDK)/mk/internal/rte.build-pre.mk
-
-# VPATH contains at least SRCDIR
-VPATH += $(SRCDIR)
-
-_BUILD = $(HOSTLIB)
-_INSTALL = $(INSTALL-FILES-y) $(SYMLINK-FILES-y) $(RTE_OUTPUT)/hostlib/$(HOSTLIB)
-_CLEAN = doclean
-
-.PHONY: all
-all: install
-
-.PHONY: install
-install: build _postinstall
-
-_postinstall: build
-
-.PHONY: build
-build: _postbuild
-
-exe2cmd = $(strip $(call dotfile,$(patsubst %,%.cmd,$(1))))
-
-O_TO_A = $(AR) crus $(HOSTLIB) $(OBJS-y)
-O_TO_A_STR = $(subst ','\'',$(O_TO_A)) #'# fix syntax highlight
-O_TO_A_DISP = $(if $(V),"$(O_TO_A_STR)","  HOSTAR $(@)")
-O_TO_A_CMD = "cmd_$@ = $(O_TO_A_STR)"
-O_TO_A_DO = @set -e; \
-	echo $(O_TO_A_DISP); \
-	$(O_TO_A) && \
-	echo $(O_TO_A_CMD) > $(call exe2cmd,$(@))
-
--include .$(HOSTLIB).cmd
-
-#
-# Archive objects in .a file if needed
-#
-$(HOSTLIB): $(OBJS-y) FORCE
-	@[ -d $(dir $@) ] || mkdir -p $(dir $@)
-	$(if $(D),\
-		@echo -n "$@ -> $< " ; \
-		echo -n "file_missing=$(call boolean,$(file_missing)) " ; \
-		echo -n "cmdline_changed=$(call boolean,$(call cmdline_changed,$(O_TO_A_STR))) " ; \
-		echo -n "depfile_missing=$(call boolean,$(depfile_missing)) " ; \
-		echo "depfile_newer=$(call boolean,$(depfile_newer)) ")
-	$(if $(or \
-		$(file_missing),\
-		$(call cmdline_changed,$(O_TO_A_STR)),\
-		$(depfile_missing),\
-		$(depfile_newer)),\
-		$(O_TO_A_DO))
-
-#
-# install lib in $(RTE_OUTPUT)/hostlib
-#
-$(RTE_OUTPUT)/hostlib/$(HOSTLIB): $(HOSTLIB)
-	@echo "  INSTALL-HOSTLIB $(HOSTLIB)"
-	@[ -d $(RTE_OUTPUT)/hostlib ] || mkdir -p $(RTE_OUTPUT)/hostlib
-	$(Q)cp -f $(HOSTLIB) $(RTE_OUTPUT)/hostlib
-
-#
-# Clean all generated files
-#
-.PHONY: clean
-clean: _postclean
-
-.PHONY: doclean
-doclean:
-	$(Q)rm -rf $(HOSTLIB) $(OBJS-all) $(DEPS-all) $(DEPSTMP-all) \
-	  $(CMDS-all) $(INSTALL-FILES-all)
-	$(Q)rm -f $(_BUILD_TARGETS) $(_INSTALL_TARGETS) $(_CLEAN_TARGETS)
-
-include $(RTE_SDK)/mk/internal/rte.compile-post.mk
-include $(RTE_SDK)/mk/internal/rte.install-post.mk
-include $(RTE_SDK)/mk/internal/rte.clean-post.mk
-include $(RTE_SDK)/mk/internal/rte.build-post.mk
-
-.PHONY: FORCE
-FORCE:
diff --git a/mk/rte.install.mk b/mk/rte.install.mk
deleted file mode 100644
index e56daf457c..0000000000
--- a/mk/rte.install.mk
+++ /dev/null
@@ -1,28 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-# install-only makefile (no build target)
-
-include $(RTE_SDK)/mk/internal/rte.install-pre.mk
-include $(RTE_SDK)/mk/internal/rte.clean-pre.mk
-
-# VPATH contains at least SRCDIR
-VPATH += $(SRCDIR)
-
-_INSTALL = $(INSTALL-FILES-y) $(SYMLINK-FILES-y)
-_CLEAN = doclean
-
-.PHONY: all
-all: _postinstall
-	@true
-
-.PHONY: clean
-clean: _postclean
-
-.PHONY: doclean
-doclean:
-	@rm -rf $(INSTALL-FILES-all)
-	@rm -f $(_INSTALL_TARGETS) $(_CLEAN_TARGETS)
-
-include $(RTE_SDK)/mk/internal/rte.install-post.mk
-include $(RTE_SDK)/mk/internal/rte.clean-post.mk
diff --git a/mk/rte.lib.mk b/mk/rte.lib.mk
deleted file mode 100644
index 229ae16814..0000000000
--- a/mk/rte.lib.mk
+++ /dev/null
@@ -1,156 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-include $(RTE_SDK)/mk/internal/rte.compile-pre.mk
-include $(RTE_SDK)/mk/internal/rte.install-pre.mk
-include $(RTE_SDK)/mk/internal/rte.clean-pre.mk
-include $(RTE_SDK)/mk/internal/rte.build-pre.mk
-
-EXTLIB_BUILD ?= n
-
-# VPATH contains at least SRCDIR
-VPATH += $(SRCDIR)
-
-LIBABIVER ?= $(shell cat $(RTE_SRCDIR)/ABI_VERSION)
-SOVER := $(basename $(LIBABIVER))
-
-ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y)
-SONAME := $(patsubst %.a,%.so.$(SOVER),$(LIB))
-LIB := $(patsubst %.a,%.so.$(LIBABIVER),$(LIB))
-ifeq ($(EXTLIB_BUILD),n)
-CPU_LDFLAGS += --version-script=$(SRCDIR)/$(EXPORT_MAP)
-endif
-endif
-
-
-_BUILD = $(LIB)
-PREINSTALL = $(SYMLINK-FILES-y)
-_INSTALL = $(INSTALL-FILES-y) $(RTE_OUTPUT)/lib/$(LIB)
-_CLEAN = doclean
-
-LDLIBS += $(EXECENV_LDLIBS-y)
-
-.PHONY: all
-all: install
-
-.PHONY: install
-ifeq ($(SYMLINK-FILES-y),)
-install: build _postinstall
-else
-install: _preinstall build _postinstall
-build: _preinstall
-endif
-
-_postinstall: build
-
-.PHONY: build
-build: _postbuild
-
-exe2cmd = $(strip $(call dotfile,$(patsubst %,%.cmd,$(1))))
-
-ifeq ($(LINK_USING_CC),1)
-# Override the definition of LD here, since we're linking with CC
-LD := $(CC) $(CPU_CFLAGS) $(EXTRA_CFLAGS)
-_CPU_LDFLAGS := $(call linkerprefix,$(CPU_LDFLAGS))
-override EXTRA_LDFLAGS := $(call linkerprefix,$(EXTRA_LDFLAGS))
-else
-_CPU_LDFLAGS := $(CPU_LDFLAGS)
-endif
-
-O_TO_A = $(AR) crDs $(LIB) $(OBJS-y)
-O_TO_A_STR = $(subst ','\'',$(O_TO_A)) #'# fix syntax highlight
-O_TO_A_DISP = $(if $(V),"$(O_TO_A_STR)","  AR $(@)")
-O_TO_A_CMD = "cmd_$@ = $(O_TO_A_STR)"
-O_TO_A_DO = @set -e; \
-	echo $(O_TO_A_DISP); \
-	$(O_TO_A) && \
-	echo $(O_TO_A_CMD) > $(call exe2cmd,$(@))
-
-ifneq ($(CC_SUPPORTS_Z),false)
-NO_UNDEFINED := -z defs
-endif
-
-O_TO_S = $(LD) -L$(RTE_SDK_BIN)/lib $(_CPU_LDFLAGS) $(EXTRA_LDFLAGS) \
-	  -shared $(OBJS-y) $(NO_UNDEFINED) $(LDLIBS) -Wl,-soname,$(SONAME) -o $(LIB)
-O_TO_S_STR = $(subst ','\'',$(O_TO_S)) #'# fix syntax highlight
-O_TO_S_DISP = $(if $(V),"$(O_TO_S_STR)","  LD $(@)")
-O_TO_S_DO = @set -e; \
-	echo $(O_TO_S_DISP); \
-	$(O_TO_S) && \
-	echo $(O_TO_S_CMD) > $(call exe2cmd,$(@))
-
--include .$(LIB).cmd
-
-#
-# Archive objects in .a file if needed
-#
-ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y)
-$(LIB): $(OBJS-y) $(DEP_$(LIB)) FORCE
-ifeq ($(LIBABIVER),)
-	@echo "Must Specify a $(LIB) ABI version"
-	@false
-endif
-	@[ -d $(dir $@) ] || mkdir -p $(dir $@)
-	$(if $(D),\
-		@echo -n "$< -> $@ " ; \
-		echo -n "file_missing=$(call boolean,$(file_missing)) " ; \
-		echo -n "cmdline_changed=$(call boolean,$(call cmdline_changed,$(O_TO_S_STR))) " ; \
-		echo -n "depfile_missing=$(call boolean,$(depfile_missing)) " ; \
-		echo "depfile_newer=$(call boolean,$(depfile_newer)) ")
-	$(if $(or \
-		$(file_missing),\
-		$(call cmdline_changed,$(O_TO_S_STR)),\
-		$(depfile_missing),\
-		$(depfile_newer)),\
-		$(O_TO_S_DO))
-
-else
-$(LIB): $(OBJS-y) $(DEP_$(LIB)) FORCE
-	@[ -d $(dir $@) ] || mkdir -p $(dir $@)
-	$(if $(D),\
-	    @echo -n "$< -> $@ " ; \
-	    echo -n "file_missing=$(call boolean,$(file_missing)) " ; \
-	    echo -n "cmdline_changed=$(call boolean,$(call cmdline_changed,$(O_TO_A_STR))) " ; \
-	    echo -n "depfile_missing=$(call boolean,$(depfile_missing)) " ; \
-	    echo "depfile_newer=$(call boolean,$(depfile_newer)) ")
-	$(if $(or \
-	    $(file_missing),\
-	    $(call cmdline_changed,$(O_TO_A_STR)),\
-	    $(depfile_missing),\
-	    $(depfile_newer)),\
-	    $(O_TO_A_DO))
-endif
-
-#
-# install lib in $(RTE_OUTPUT)/lib
-#
-$(RTE_OUTPUT)/lib/$(LIB): $(LIB)
-	@echo "  INSTALL-LIB $(LIB)"
-	@[ -d $(RTE_OUTPUT)/lib ] || mkdir -p $(RTE_OUTPUT)/lib
-	$(Q)cp -f $(LIB) $(RTE_OUTPUT)/lib
-ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y)
-	$(Q)ln -s -f $< $(shell echo $@ | sed 's/\.so.*/.so/')
-	$(Q)if [ $(SOVER) != $(LIBABIVER) ]; then \
-		ln -s -f $< $(shell echo $@ | sed 's/\.so.*/.so.$(SOVER)/') ; \
-	fi
-endif
-
-#
-# Clean all generated files
-#
-.PHONY: clean
-clean: _postclean
-
-.PHONY: doclean
-doclean:
-	$(Q)rm -rf $(LIB) $(OBJS-all) $(DEPS-all) $(DEPSTMP-all) \
-	  $(CMDS-all) .$(LIB).cmd $(INSTALL-FILES-all) *.pmd.c *.pmd.o
-	$(Q)rm -f $(_BUILD_TARGETS) $(_INSTALL_TARGETS) $(_CLEAN_TARGETS)
-
-include $(RTE_SDK)/mk/internal/rte.compile-post.mk
-include $(RTE_SDK)/mk/internal/rte.install-post.mk
-include $(RTE_SDK)/mk/internal/rte.clean-post.mk
-include $(RTE_SDK)/mk/internal/rte.build-post.mk
-
-.PHONY: FORCE
-FORCE:
diff --git a/mk/rte.module.mk b/mk/rte.module.mk
deleted file mode 100644
index 1ada528a00..0000000000
--- a/mk/rte.module.mk
+++ /dev/null
@@ -1,86 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-##### if sourced from kernel Kbuild system
-ifneq ($(KERNELRELEASE),)
-override EXTRA_CFLAGS = $(MODULE_CFLAGS) $(EXTRA_KERNEL_CFLAGS)
-obj-m          += $(MODULE).o
-ifneq ($(MODULE),$(notdir $(SRCS-y:%.c=%)))
-$(MODULE)-objs += $(notdir $(SRCS-y:%.c=%.o))
-endif
-
-##### if launched from rte build system
-else
-
-include $(RTE_SDK)/mk/internal/rte.install-pre.mk
-include $(RTE_SDK)/mk/internal/rte.clean-pre.mk
-include $(RTE_SDK)/mk/internal/rte.build-pre.mk
-
-# VPATH contains at least SRCDIR
-VPATH += $(SRCDIR)
-
-_BUILD = $(MODULE).ko
-_INSTALL = $(INSTALL-FILES-y) $(SYMLINK-FILES-y) \
-	$(RTE_OUTPUT)/kmod/$(MODULE).ko
-_CLEAN = doclean
-
-SRCS_LINKS = $(addsuffix _link,$(SRCS-y))
-
-compare = $(strip $(subst $(1),,$(2)) $(subst $(2),,$(1)))
-
-.PHONY: all
-all: install
-
-.PHONY: install
-install: build _postinstall
-
-_postinstall: build
-
-.PHONY: build
-build: _postbuild
-
-# Link all sources in build directory
-%_link: FORCE
-	$(if $(call compare,$(notdir $*),$*),\
-	@if [ ! -f $(notdir $(*)) ]; then ln -nfs $(SRCDIR)/$(*) . ; fi,\
-	@if [ ! -f $(notdir $(*)) ]; then ln -nfs $(SRCDIR)/$(*) . ; fi)
-
-# build module
-$(MODULE).ko: $(SRCS_LINKS)
-	@if [ ! -f $(notdir Makefile) ]; then ln -nfs $(SRCDIR)/Makefile . ; fi
-	@$(MAKE) -C $(RTE_KERNELDIR) M=$(CURDIR) O=$(RTE_KERNELDIR) \
-		CC="$(KERNELCC)" CROSS_COMPILE=$(CROSS) V=$(if $V,1,0)
-
-# install module in $(RTE_OUTPUT)/kmod
-$(RTE_OUTPUT)/kmod/$(MODULE).ko: $(MODULE).ko
-	@echo INSTALL-MODULE $(MODULE).ko
-	@[ -d $(RTE_OUTPUT)/kmod ] || mkdir -p $(RTE_OUTPUT)/kmod
-	@cp -f $(MODULE).ko $(RTE_OUTPUT)/kmod
-
-# install module
-modules_install:
-	@$(MAKE) -C $(RTE_KERNELDIR) M=$(CURDIR) O=$(RTE_KERNELDIR) \
-		modules_install
-
-.PHONY: clean
-clean: _postclean
-
-# do a make clean and remove links
-.PHONY: doclean
-doclean:
-	@if [ ! -f $(notdir Makefile) ]; then ln -nfs $(SRCDIR)/Makefile . ; fi
-	$(Q)$(MAKE) -C $(RTE_KERNELDIR) M=$(CURDIR) O=$(RTE_KERNELDIR) clean
-	@$(foreach FILE,$(SRCS-y) $(SRCS-n) $(SRCS-),\
-		if [ -h $(notdir $(FILE)) ]; then rm -f $(notdir $(FILE)) ; fi ;)
-	@if [ -h $(notdir Makefile) ]; then rm -f $(notdir Makefile) ; fi
-	@rm -f $(_BUILD_TARGETS) $(_INSTALL_TARGETS) $(_CLEAN_TARGETS) \
-		$(INSTALL-FILES-all)
-
-include $(RTE_SDK)/mk/internal/rte.install-post.mk
-include $(RTE_SDK)/mk/internal/rte.clean-post.mk
-include $(RTE_SDK)/mk/internal/rte.build-post.mk
-
-.PHONY: FORCE
-FORCE:
-
-endif
diff --git a/mk/rte.obj.mk b/mk/rte.obj.mk
deleted file mode 100644
index 1641a52e75..0000000000
--- a/mk/rte.obj.mk
+++ /dev/null
@@ -1,82 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-include $(RTE_SDK)/mk/internal/rte.compile-pre.mk
-include $(RTE_SDK)/mk/internal/rte.install-pre.mk
-include $(RTE_SDK)/mk/internal/rte.clean-pre.mk
-include $(RTE_SDK)/mk/internal/rte.build-pre.mk
-
-# VPATH contains at least SRCDIR
-VPATH += $(SRCDIR)
-
-ifneq ($(OBJ),)
-_BUILD = $(OBJ)
-else
-_BUILD = $(OBJS-y)
-endif
-_INSTALL = $(INSTALL-FILES-y) $(SYMLINK-FILES-y)
-_CLEAN = doclean
-
-.PHONY: all
-all: install
-
-.PHONY: install
-install: build _postinstall
-
-_postinstall: build
-
-.PHONY: build
-build: _postbuild
-
-ifneq ($(OBJ),)
-exe2cmd = $(strip $(call dotfile,$(patsubst %,%.cmd,$(1))))
-
-O_TO_O = $(LD) -r -o $(OBJ) $(OBJS-y)
-O_TO_O_STR = $(subst ','\'',$(O_TO_O)) #'# fix syntax highlight
-O_TO_O_DISP =  $(if $(V),"$(O_TO_O_STR)","  LD $(@)")
-O_TO_O_CMD = "cmd_$@ = $(O_TO_O_STR)"
-O_TO_O_DO = @set -e; \
-	echo $(O_TO_O_DISP); \
-	$(O_TO_O) && \
-	echo $(O_TO_O_CMD) > $(call exe2cmd,$(@))
-
--include .$(OBJ).cmd
-
-#
-# Archive objects in .a file if needed
-#
-$(OBJ): $(OBJS-y) FORCE
-	@[ -d $(dir $@) ] || mkdir -p $(dir $@)
-	$(if $(D),\
-		@echo -n "$< -> $@ " ; \
-		echo -n "file_missing=$(call boolean,$(file_missing)) " ; \
-		echo -n "cmdline_changed=$(call boolean,$(call cmdline_changed,$(O_TO_O_STR))) " ; \
-		echo -n "depfile_missing=$(call boolean,$(depfile_missing)) " ; \
-		echo "depfile_newer=$(call boolean,$(depfile_newer)) ")
-	$(if $(or \
-		$(file_missing),\
-		$(call cmdline_changed,$(O_TO_O_STR)),\
-		$(depfile_missing),\
-		$(depfile_newer)),\
-		$(O_TO_O_DO))
-endif
-
-#
-# Clean all generated files
-#
-.PHONY: clean
-clean: _postclean
-
-.PHONY: doclean
-doclean:
-	@rm -rf $(OBJ) $(OBJS-all) $(DEPS-all) $(DEPSTMP-all) \
-	  $(CMDS-all) $(INSTALL-FILES-all)
-	@rm -f $(_BUILD_TARGETS) $(_INSTALL_TARGETS) $(_CLEAN_TARGETS)
-
-include $(RTE_SDK)/mk/internal/rte.compile-post.mk
-include $(RTE_SDK)/mk/internal/rte.install-post.mk
-include $(RTE_SDK)/mk/internal/rte.clean-post.mk
-include $(RTE_SDK)/mk/internal/rte.build-post.mk
-
-.PHONY: FORCE
-FORCE:
diff --git a/mk/rte.sdkbuild.mk b/mk/rte.sdkbuild.mk
deleted file mode 100644
index d1d57b6695..0000000000
--- a/mk/rte.sdkbuild.mk
+++ /dev/null
@@ -1,77 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2015 Intel Corporation
-
-#
-# include rte.vars.mk if config file exists
-#
-ifeq (,$(wildcard $(RTE_OUTPUT)/.config))
-  $(error "need a make config first")
-else
-  include $(RTE_SDK)/mk/rte.vars.mk
-endif
-
-# allow exec-env specific targets
--include $(RTE_SDK)/mk/exec-env/$(RTE_EXEC_ENV)/rte.custom.mk
-
-buildtools: | lib
-kernel: | lib
-drivers: | lib buildtools
-app: | lib buildtools drivers
-test: | lib buildtools drivers
-
-#
-# build and clean targets
-#
-
-CLEANDIRS = $(addsuffix _clean,$(ROOTDIRS-y) $(ROOTDIRS-n) $(ROOTDIRS-))
-
-.PHONY: build
-build: $(ROOTDIRS-y)
-	@echo "Build complete [$(RTE_TARGET)]"
-	@echo "==== NOTE ===="
-	@echo "It is recommended to build DPDK using 'meson' and 'ninja'"
-	@echo "See https://doc.dpdk.org/guides/linux_gsg/build_dpdk.html for instructions"
-	@echo "Building DPDK with 'make' will be deprecated in a future release"
-	@echo "=============="
-
-.PHONY: clean
-clean: $(CLEANDIRS)
-	@rm -rf $(RTE_OUTPUT)/include $(RTE_OUTPUT)/app \
-		$(RTE_OUTPUT)/lib \
-		$(RTE_OUTPUT)/hostlib $(RTE_OUTPUT)/kmod
-	@[ -d $(RTE_OUTPUT)/include ] || mkdir -p $(RTE_OUTPUT)/include
-	@$(RTE_SDK)/buildtools/gen-config-h.sh $(RTE_OUTPUT)/.config \
-		> $(RTE_OUTPUT)/include/rte_config.h
-	$(Q)$(MAKE) -f $(RTE_SDK)/GNUmakefile gcovclean
-	@echo Clean complete
-
-.SECONDEXPANSION:
-.PHONY: $(ROOTDIRS-y) $(ROOTDIRS-)
-$(ROOTDIRS-y) $(ROOTDIRS-):
-	@[ -d $(BUILDDIR)/$@ ] || mkdir -p $(BUILDDIR)/$@
-	@echo "== Build $@"
-	$(Q)$(MAKE) S=$@ -f $(RTE_SRCDIR)/$@/Makefile -C $(BUILDDIR)/$@ all
-	@if [ $@ = drivers ]; then \
-		$(MAKE) -f $(RTE_SDK)/mk/rte.combinedlib.mk; \
-	fi
-
-%_clean:
-	@echo "== Clean $*"
-	$(Q)if [ -f $(RTE_SRCDIR)/$*/Makefile -a -d $(BUILDDIR)/$* ]; then \
-		$(MAKE) S=$* -f $(RTE_SRCDIR)/$*/Makefile -C $(BUILDDIR)/$* clean ; \
-	fi
-
-RTE_MAKE_SUBTARGET ?= all
-
-%_sub: $(addsuffix _sub,$(*))
-	@echo $(addsuffix _sub,$(*))
-	@[ -d $(BUILDDIR)/$* ] || mkdir -p $(BUILDDIR)/$*
-	@echo "== Build $*"
-	$(Q)$(MAKE) S=$* -f $(RTE_SRCDIR)/$*/Makefile -C $(BUILDDIR)/$* \
-		$(RTE_MAKE_SUBTARGET)
-
-.PHONY: all
-all: build
-
-.PHONY: FORCE
-FORCE:
diff --git a/mk/rte.sdkconfig.mk b/mk/rte.sdkconfig.mk
deleted file mode 100644
index f538649f22..0000000000
--- a/mk/rte.sdkconfig.mk
+++ /dev/null
@@ -1,142 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-.PHONY: showversion
-showversion:
-	@cat $(RTE_SRCDIR)/VERSION
-
-.PHONY: showversionum
-showversionum:
-	@cat $(RTE_SRCDIR)/VERSION | awk -F '.' '{print $$1$$2}'
-
-INSTALL_CONFIGS := $(sort $(filter-out %app-icc,$(filter-out %app-clang,\
-	$(filter-out %app-gcc,$(filter-out %~,\
-	$(patsubst $(RTE_SRCDIR)/config/defconfig_%,%,\
-	$(wildcard $(RTE_SRCDIR)/config/defconfig_*)))))))
-INSTALL_TARGETS := $(addsuffix _install,$(INSTALL_CONFIGS))
-
-.PHONY: showconfigs
-showconfigs:
-	@$(foreach CONFIG, $(INSTALL_CONFIGS), echo $(CONFIG);)
-
-.PHONY: notemplate
-notemplate:
-	@printf "No template specified. Use 'make defconfig' or "
-	@echo "use T=template from the following list:"
-	@$(MAKE) -rR showconfigs | sed 's,^,  ,'
-
-.PHONY: defconfig
-defconfig:
-	@$(MAKE) config T=$(shell \
-                uname -m | awk '{ \
-                if ($$0 == "aarch64") { \
-                        print "arm64-armv8a"} \
-                else if ($$0 == "armv7l") { \
-                        print "arm-armv7a"} \
-                else if ($$0 == "ppc64") { \
-                        print "ppc_64-power8"} \
-                else if ($$0 == "amd64") { \
-                        print "x86_64-native"} \
-                else { \
-                        printf "%s-native", $$0} }' \
-		)-$(shell \
-                uname | awk '{ \
-                if ($$0 == "Linux") { \
-                        print "linux"} \
-                else { \
-                        print "freebsd"} }' \
-		)-$(shell \
-		${CC} --version | grep -o 'cc\|gcc\|icc\|clang' | awk \
-		'{ \
-		if ($$1 == "cc") { \
-			print "gcc" } \
-		else { \
-			print $$1 } \
-		}' \
-		)
-
-.PHONY: config
-ifeq ($(RTE_CONFIG_TEMPLATE),)
-config: notemplate
-else
-config: $(RTE_OUTPUT)/include/rte_config.h $(RTE_OUTPUT)/Makefile
-	@echo "Configuration done using" \
-		$(patsubst defconfig_%,%,$(notdir $(RTE_CONFIG_TEMPLATE)))
-endif
-
-$(RTE_OUTPUT):
-	$(Q)mkdir -p $@
-
-ifdef NODOTCONF
-$(RTE_OUTPUT)/.config: ;
-else
-# Generate config from template, if there are duplicates keep only the last.
-# To do so the temp config is checked for duplicate keys with cut/sort/uniq
-# Then for each of those identified duplicates as long as there are more than
-# just one left the last match is removed.
-# Part of the config includes the version information taken from "VERSION"
-# in the repo. This needs to be split into the various parts using sed and awk.
-# To ensure correct version comparison, we append ".99" to the version number
-# so that the version of a release is higher than that of its rc's.
-$(RTE_OUTPUT)/.config: $(RTE_CONFIG_TEMPLATE) FORCE | $(RTE_OUTPUT)
-	$(Q)if [ "$(RTE_CONFIG_TEMPLATE)" != "" -a -f "$(RTE_CONFIG_TEMPLATE)" ]; then \
-		$(CPP) -undef -P -x assembler-with-cpp \
-		`cat $(RTE_SRCDIR)/VERSION | \
-		sed -e 's/-rc/.-rc./' -e 's/$$/..99/' | \
-		awk -F '.' '{print "-D__YEAR="int($$1), "-D__MONTH="int($$2), "-D__MINOR="int($$3), "-D__SUFFIX=\""$$4"\"", "-D__RELEASE="int($$5)}'` \
-		-ffreestanding \
-		-o $(RTE_OUTPUT)/.config_tmp $(RTE_CONFIG_TEMPLATE) ; \
-		config=$$(cat $(RTE_OUTPUT)/.config_tmp) ; \
-		echo "$$config" | awk -F '=' 'BEGIN {i=1} \
-			/^#/ {pos[i++]=$$0} \
-			!/^#/ {if (!s[$$1]) {pos[i]=$$0; s[$$1]=i++} \
-				else {pos[s[$$1]]=$$0}} END \
-			{for (j=1; j<i; j++) print pos[j]}' \
-			> $(RTE_OUTPUT)/.config_tmp ; \
-		if ! cmp -s $(RTE_OUTPUT)/.config_tmp $(RTE_OUTPUT)/.config; then \
-			cp $(RTE_OUTPUT)/.config_tmp $(RTE_OUTPUT)/.config ; \
-			cp $(RTE_OUTPUT)/.config_tmp $(RTE_OUTPUT)/.config.orig ; \
-		fi ; \
-		rm -f $(RTE_OUTPUT)/.config_tmp ; \
-	else \
-		$(MAKE) -rRf $(RTE_SDK)/mk/rte.sdkconfig.mk notemplate; \
-	fi
-endif
-
-# generate a Makefile for this build directory
-# use a relative path so it will continue to work even if we move the directory
-SDK_RELPATH=$(shell $(RTE_SDK)/buildtools/relpath.sh $(abspath $(RTE_SRCDIR)) \
-				$(abspath $(RTE_OUTPUT)))
-OUTPUT_RELPATH=$(shell $(RTE_SDK)/buildtools/relpath.sh $(abspath $(RTE_OUTPUT)) \
-				$(abspath $(RTE_SRCDIR)))
-$(RTE_OUTPUT)/Makefile: | $(RTE_OUTPUT)
-	$(Q)$(RTE_SDK)/buildtools/gen-build-mk.sh $(SDK_RELPATH) > $@
-
-# clean installed files, and generate a new config header file
-# if NODOTCONF variable is defined, don't try to rebuild .config
-$(RTE_OUTPUT)/include/rte_config.h: $(RTE_OUTPUT)/.config
-	$(Q)rm -rf $(RTE_OUTPUT)/include $(RTE_OUTPUT)/app \
-		$(RTE_OUTPUT)/lib \
-		$(RTE_OUTPUT)/hostlib $(RTE_OUTPUT)/kmod $(RTE_OUTPUT)/build
-	$(Q)mkdir -p $(RTE_OUTPUT)/include
-	$(Q)$(RTE_SDK)/buildtools/gen-config-h.sh $(RTE_OUTPUT)/.config \
-		> $(RTE_OUTPUT)/include/rte_config.h
-
-# generate the rte_config.h
-.PHONY: headerconfig
-headerconfig: $(RTE_OUTPUT)/include/rte_config.h
-	@true
-
-# check that .config is present, and if yes, check that rte_config.h
-# is up to date
-.PHONY: checkconfig
-checkconfig:
-	@if [ ! -f $(RTE_OUTPUT)/.config ]; then \
-		echo "No .config in build directory"; \
-		exit 1; \
-	fi
-	$(Q)$(MAKE) -f $(RTE_SDK)/mk/rte.sdkconfig.mk \
-		headerconfig NODOTCONF=1
-
-.PHONY: FORCE
-FORCE:
diff --git a/mk/rte.sdkdepdirs.mk b/mk/rte.sdkdepdirs.mk
deleted file mode 100644
index 7adeb0e11b..0000000000
--- a/mk/rte.sdkdepdirs.mk
+++ /dev/null
@@ -1,9 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-ifeq (,$(wildcard $(RTE_OUTPUT)/.config))
-  $(error "need a make config first")
-endif
-ifeq (,$(wildcard $(RTE_OUTPUT)/Makefile))
-  $(error "need a make config first")
-endif
diff --git a/mk/rte.sdkdoc.mk b/mk/rte.sdkdoc.mk
deleted file mode 100644
index fd77e41867..0000000000
--- a/mk/rte.sdkdoc.mk
+++ /dev/null
@@ -1,104 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2015 Intel Corporation.
-# Copyright(c) 2013-2015 6WIND S.A.
-
-ifdef T
-ifeq ("$(origin T)", "command line")
-$(error "Cannot use T= with doc target")
-endif
-endif
-
-RTE_SPHINX_BUILD = sphinx-build
-RTE_PDFLATEX_VERBOSE := --interaction=nonstopmode
-
-ifndef V
-RTE_SPHINX_VERBOSE := -q
-RTE_PDFLATEX_VERBOSE := --interaction=batchmode
-RTE_INKSCAPE_VERBOSE := >/dev/null 2>&1
-endif
-ifeq '$V' '0'
-RTE_SPHINX_VERBOSE := -q
-RTE_PDFLATEX_VERBOSE := --interaction=batchmode
-RTE_INKSCAPE_VERBOSE := >/dev/null 2>&1
-endif
-
-RTE_PDF_DPI ?= 300
-
-RTE_GUIDES := $(filter %/, $(wildcard $(RTE_SDK)/doc/guides/*/))
-
-API_EXAMPLES := $(RTE_OUTPUT)/doc/html/examples.dox
-
-.PHONY: help
-help:
-	@cat $(RTE_SDK)/doc/build-sdk-quick.txt
-	@$(MAKE) -rR showconfigs | sed 's,^,\t\t\t\t,'
-
-.PHONY: all
-all: api-html guides-html guides-pdf
-
-.PHONY: clean
-clean: api-html-clean guides-html-clean guides-pdf-clean guides-man-clean
-
-.PHONY: api-html
-api-html: $(API_EXAMPLES)
-	@echo 'doxygen for API...'
-	$(Q)mkdir -p $(RTE_OUTPUT)/doc/html
-	$(Q)(sed -e "s|@VERSION@|`$(MAKE) -rRs showversion`|" \
-	         -e "s|@API_EXAMPLES@|$(API_EXAMPLES)|"       \
-	         -e "s|@OUTPUT@|$(RTE_OUTPUT)/doc|"           \
-	         -e "s|@HTML_OUTPUT@|html/api|"               \
-	         -e "s|@TOPDIR@|./|g"                         \
-	         -e "s|@STRIP_FROM_PATH@|./|g"                \
-	         $(RTE_SDK)/doc/api/doxy-api.conf.in)|        \
-	    doxygen -
-	$(Q)$(RTE_SDK)/doc/api/doxy-html-custom.sh $(RTE_OUTPUT)/doc/html/api/doxygen.css
-
-.PHONY: api-html-clean
-api-html-clean:
-	$(Q)rm -f $(API_EXAMPLES)
-	$(Q)rm -rf $(RTE_OUTPUT)/doc/html/api/search
-	$(Q)rm -f $(RTE_OUTPUT)/doc/html/api/*
-	$(Q)rmdir -p --ignore-fail-on-non-empty $(RTE_OUTPUT)/doc/html/api 2>&- || true
-
-$(API_EXAMPLES): api-html-clean
-	$(Q)mkdir -p $(@D)
-	$(Q)doc/api/generate_examples.sh examples $(API_EXAMPLES)
-
-guides-pdf-clean: guides-pdf-img-clean
-guides-pdf-img-clean:
-	$(Q)rm -f $(RTE_SDK)/doc/guides/*/img/*.pdf
-
-guides-%-clean:
-	$(Q)rm -rf $(RTE_OUTPUT)/doc/$*/guides
-	$(Q)rmdir -p --ignore-fail-on-non-empty $(RTE_OUTPUT)/doc/$* 2>&- || true
-
-guides-pdf: $(addprefix guides-pdf-, $(notdir $(RTE_GUIDES:/=))) ;
-guides-pdf-%:
-	@echo 'sphinx processing $@...'
-	$(Q)$(RTE_SPHINX_BUILD) -b latex $(RTE_SPHINX_VERBOSE) \
-		-c $(RTE_SDK)/doc/guides $(RTE_SDK)/doc/guides/$* \
-		$(RTE_OUTPUT)/doc/pdf/guides/$*
-	$(if $^,$(Q)rm -f $^)
-	@echo 'pdflatex processing $@...'
-	$(Q)$(MAKE) all-pdf -sC $(RTE_OUTPUT)/doc/pdf/guides/$* \
-		LATEXOPTS=$(RTE_PDFLATEX_VERBOSE)
-	$(Q)mv $(RTE_OUTPUT)/doc/pdf/guides/$*/doc.pdf \
-		$(RTE_OUTPUT)/doc/pdf/guides/$*.pdf
-
-guides-html-prepare:
-	$(Q)install -D -m0644 $(RTE_SDK)/doc/guides/custom.css \
-		$(RTE_OUTPUT)/doc/html/guides/_static/css/custom.css
-
-guides-%-prepare: ;
-
-guides-%: guides-%-prepare
-	@echo 'sphinx processing $@...'
-	$(Q)$(RTE_SPHINX_BUILD) -b $* $(RTE_SPHINX_VERBOSE) \
-		-c $(RTE_SDK)/doc/guides $(RTE_SDK)/doc/guides \
-		$(RTE_OUTPUT)/doc/$*/guides
-
-# Each PDF depends on generated images *.pdf from *.svg
-$(foreach guide, $(RTE_GUIDES), $(foreach img, $(wildcard $(guide)img/*.svg), \
-	$(eval guides-pdf-$(notdir $(guide:/=)): $(img:svg=pdf))))
-%.pdf: %.svg
-	$(Q)inkscape -d $(RTE_PDF_DPI) -D -f $< -A $@ $(RTE_INKSCAPE_VERBOSE)
diff --git a/mk/rte.sdkexamples.mk b/mk/rte.sdkexamples.mk
deleted file mode 100644
index 5eeec36494..0000000000
--- a/mk/rte.sdkexamples.mk
+++ /dev/null
@@ -1,50 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2014 6WIND S.A.
-
-# examples application are seen as external applications which are
-# not part of SDK.
-BUILDING_RTE_SDK :=
-export BUILDING_RTE_SDK
-
-# Build directory is given with O=
-O ?= $(RTE_SDK)/examples
-
-# Target for which examples should be built.
-T ?= *
-
-# list all available configurations
-EXAMPLES_CONFIGS := $(patsubst $(RTE_SRCDIR)/config/defconfig_%,%,\
-	$(wildcard $(RTE_SRCDIR)/config/defconfig_$(T)))
-EXAMPLES_TARGETS := $(addsuffix _examples,\
-	$(filter-out %~,$(EXAMPLES_CONFIGS)))
-
-.PHONY: examples
-examples: $(EXAMPLES_TARGETS)
-
-%_examples:
-	@echo ================== Build examples for $*
-	$(Q)if [ ! -d "${RTE_SDK}/${*}" ]; then \
-		echo "Target ${*} does not exist in ${RTE_SDK}/${*}." ; \
-		echo -n "Please install DPDK first (make install) or use another " ; \
-		echo "target argument (T=target)." ; \
-		false ; \
-	else \
-		$(MAKE) -C examples O=$(abspath $(O)) RTE_TARGET=$(*); \
-	fi
-
-EXAMPLES_CLEAN_TARGETS := $(addsuffix _examples_clean,\
-	$(filter-out %~,$(EXAMPLES_CONFIGS)))
-
-.PHONY: examples_clean
-examples_clean: $(EXAMPLES_CLEAN_TARGETS)
-
-%_examples_clean:
-	@echo ================== Clean examples for $*
-	$(Q)if [ ! -d "${RTE_SDK}/${*}" ]; then \
-		echo "Target ${*} does not exist in ${RTE_SDK}/${*}." ; \
-		echo -n "Please install DPDK first (make install) or use another " ; \
-		echo "target argument (T=target)." ; \
-		false ; \
-	else \
-		$(MAKE) -C examples O=$(abspath $(O)) RTE_TARGET=$(*) clean; \
-	fi
diff --git a/mk/rte.sdkgcov.mk b/mk/rte.sdkgcov.mk
deleted file mode 100644
index ab528b18b8..0000000000
--- a/mk/rte.sdkgcov.mk
+++ /dev/null
@@ -1,39 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-ifdef T
-ifeq ("$(origin T)", "command line")
-$(error "Cannot use T= with gcov target")
-endif
-endif
-
-ifeq (,$(wildcard $(RTE_OUTPUT)/.config))
-  $(error "need a make config first")
-else
-  include $(RTE_SDK)/mk/rte.vars.mk
-endif
-ifeq (,$(wildcard $(RTE_OUTPUT)/Makefile))
-  $(error "need a make config first")
-endif
-
-INPUTDIR  = $(RTE_OUTPUT)
-OUTPUTDIR =  $(RTE_OUTPUT)/gcov
-
-.PHONY: gcovclean
-gcovclean:
-	$(Q)find $(INPUTDIR)/build -name "*.gcno" -o -name "*.gcda" -exec rm {} \;
-	$(Q)rm -rf $(OUTPUTDIR)
-
-.PHONY: gcov
-gcov:
-	$(Q)for APP in test ; do \
-		mkdir -p $(OUTPUTDIR)/$$APP ; cd $(OUTPUTDIR)/$$APP ; \
-		for FIC in `strings $(RTE_OUTPUT)/app/$$APP | grep gcda | sed s,gcda,o,` ; do \
-			SUBDIR=`basename $$FIC`;\
-			mkdir $$SUBDIR ;\
-			cd $$SUBDIR ;\
-			$(GCOV) $(RTE_OUTPUT)/app/$$APP -o $$FIC > gcov.log; \
-			cd - >/dev/null;\
-		done ; \
-		cd - >/dev/null; \
-	done
diff --git a/mk/rte.sdkinstall.mk b/mk/rte.sdkinstall.mk
deleted file mode 100644
index 32bed5d951..0000000000
--- a/mk/rte.sdkinstall.mk
+++ /dev/null
@@ -1,152 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation.
-# Copyright 2015 6WIND S.A.
-
-# Configuration, compilation and installation can be done at once
-# with make install T=<config>
-
-ifdef T # config, build and install combined
-# The build directory is T and may be prepended with O
-O ?= .
-RTE_OUTPUT := $O/$T
-else # standard install
-# Build directory is given with O=
-O ?= build
-RTE_OUTPUT := $O
-endif
-
-ifneq ($(MAKECMDGOALS),pre_install)
-include $(RTE_SDK)/mk/rte.vars.mk
-endif
-
-ifdef T # defaults with T= will install an almost flat staging tree
-export prefix ?=
-kerneldir   ?= $(prefix)/kmod
-else
-ifeq ($(RTE_EXEC_ENV),linuxapp)
-RTE_EXEC_ENV=linux
-endif
-ifeq ($(RTE_EXEC_ENV),linux)
-kerneldir   ?= $(RTE_KERNELDIR:/build=/extra/dpdk)
-else
-kerneldir   ?= /boot/modules
-endif
-prefix      ?=     /usr/local
-endif
-exec_prefix ?=      $(prefix)
-bindir      ?= $(exec_prefix)/bin
-sbindir     ?= $(exec_prefix)/sbin
-libdir      ?= $(exec_prefix)/lib
-includedir  ?=      $(prefix)/include/dpdk
-datarootdir ?=      $(prefix)/share
-docdir      ?=       $(datarootdir)/doc/dpdk
-datadir     ?=       $(datarootdir)/dpdk
-mandir      ?=       $(datarootdir)/man
-sdkdir      ?=                $(datadir)
-targetdir   ?=                $(datadir)/$(RTE_TARGET)
-
-# The install directories may be staged in DESTDIR
-
-# Create the directory $1 if not exists
-rte_mkdir = test -d $1 || mkdir -p $1
-
-# Create the relative symbolic link $2 -> $1
-# May be replaced with --relative option of ln from coreutils-8.16
-rte_symlink = ln -snf $$($(RTE_SDK)/buildtools/relpath.sh $1 $(dir $2)) $2
-
-.PHONY: pre_install
-pre_install:
-ifdef T
-	$(Q)if [ ! -f $(RTE_OUTPUT)/.config ]; then \
-		$(MAKE) config O=$(RTE_OUTPUT); \
-	elif cmp -s $(RTE_OUTPUT)/.config.orig $(RTE_OUTPUT)/.config; then \
-		$(MAKE) config O=$(RTE_OUTPUT); \
-	else \
-		if [ -f $(RTE_OUTPUT)/.config.orig ] ; then \
-			tmp_build=$(RTE_OUTPUT)/.config.tmp; \
-			$(MAKE) config O=$$tmp_build; \
-			if ! cmp -s $(RTE_OUTPUT)/.config.orig $$tmp_build/.config ; then \
-				echo "Conflict: local config and template config have both changed"; \
-				exit 1; \
-			fi; \
-		fi; \
-		echo "Using local configuration"; \
-	fi
-	$(Q)$(MAKE) all O=$(RTE_OUTPUT)
-endif
-
-.PHONY: install
-install:
-ifeq ($(DESTDIR)$(if $T,,+),)
-	@echo Installation cannot run with T defined and DESTDIR undefined
-else
-	@echo ================== Installing $(DESTDIR)$(prefix)/
-	$(Q)$(MAKE) O=$(RTE_OUTPUT) T= install-runtime
-	$(Q)$(MAKE) O=$(RTE_OUTPUT) T= install-kmod
-	$(Q)$(MAKE) O=$(RTE_OUTPUT) T= install-sdk
-	$(Q)$(MAKE) O=$(RTE_OUTPUT) T= install-doc
-	@echo Installation in $(DESTDIR)$(prefix)/ complete
-endif
-
-# when installing we want recursive copies preserving timestamps only, no
-# preservation of user/group ids or permissions
-CP_FLAGS=-dR --preserve=timestamps
-TAR_X_FLAGS=--strip-components=1 --keep-newer-files --no-same-owner --no-same-permissions
-
-install-runtime:
-	$(Q)$(call rte_mkdir, $(DESTDIR)$(libdir))
-	$(Q)cp $(CP_FLAGS)    $O/lib/* $(DESTDIR)$(libdir)
-	$(Q)$(call rte_mkdir, $(DESTDIR)$(bindir))
-	$(Q)tar -cf -      -C $O --exclude 'app/*.map' \
-		--exclude app/dpdk-pmdinfogen \
-		--exclude 'app/cmdline*' --exclude app/test \
-		--exclude app/testacl --exclude app/testpipeline app | \
-	    tar -xf -      -C $(DESTDIR)$(bindir) $(TAR_X_FLAGS)
-	$(Q)$(call rte_mkdir,      $(DESTDIR)$(datadir)/usertools)
-	$(Q)tar -cf -      -C $(RTE_SDK) --exclude meson.build usertools | \
-	    tar -xf -      -C $(DESTDIR)$(datadir)/usertools $(TAR_X_FLAGS)
-	$(Q)$(call rte_mkdir,      $(DESTDIR)$(sbindir))
-	$(Q)$(call rte_symlink,    $(DESTDIR)$(datadir)/usertools/dpdk-devbind.py, \
-	                           $(DESTDIR)$(sbindir)/dpdk-devbind)
-	$(Q)$(call rte_symlink,    $(DESTDIR)$(datadir)/usertools/dpdk-pmdinfo.py, \
-	                           $(DESTDIR)$(bindir)/dpdk-pmdinfo)
-ifneq ($(wildcard $O/doc/man/*/*.1),)
-	$(Q)$(call rte_mkdir,      $(DESTDIR)$(mandir)/man1)
-	$(Q)cp $(CP_FLAGS) $O/doc/man/*/*.1 $(DESTDIR)$(mandir)/man1
-endif
-ifneq ($(wildcard $O/doc/man/*/*.8),)
-	$(Q)$(call rte_mkdir,      $(DESTDIR)$(mandir)/man8)
-	$(Q)cp $(CP_FLAGS) $O/doc/man/*/*.8 $(DESTDIR)$(mandir)/man8
-endif
-
-install-kmod:
-ifneq ($(wildcard $O/kmod/*),)
-	$(Q)$(call rte_mkdir, $(DESTDIR)$(kerneldir))
-	$(Q)cp $(CP_FLAGS)   $O/kmod/* $(DESTDIR)$(kerneldir)
-endif
-
-install-sdk:
-	$(Q)$(call rte_mkdir, $(DESTDIR)$(includedir))
-	$(Q)tar -chf -     -C $O include | \
-	    tar -xf -      -C $(DESTDIR)$(includedir) $(TAR_X_FLAGS)
-	$(Q)$(call rte_mkdir,                            $(DESTDIR)$(sdkdir))
-	$(Q)cp $(CP_FLAGS)      $(RTE_SDK)/mk            $(DESTDIR)$(sdkdir)
-	$(Q)cp $(CP_FLAGS)      $(RTE_SDK)/buildtools    $(DESTDIR)$(sdkdir)
-	$(Q)$(call rte_mkdir,                            $(DESTDIR)$(targetdir)/app)
-	$(Q)cp $(CP_FLAGS)      $O/.config               $(DESTDIR)$(targetdir)
-	$(Q)cp $(CP_FLAGS)      $O/app/dpdk-pmdinfogen   $(DESTDIR)$(targetdir)/app
-	$(Q)$(call rte_symlink, $(DESTDIR)$(includedir), $(DESTDIR)$(targetdir)/include)
-	$(Q)$(call rte_symlink, $(DESTDIR)$(libdir),     $(DESTDIR)$(targetdir)/lib)
-
-install-doc:
-ifneq ($(wildcard $O/doc/html),)
-	$(Q)$(call rte_mkdir, $(DESTDIR)$(docdir))
-	$(Q)tar -cf -      -C $O/doc --exclude 'html/guides/.*' html | \
-	    tar -xf -      -C $(DESTDIR)$(docdir) $(TAR_X_FLAGS)
-endif
-ifneq ($(wildcard $O/doc/*/*/*pdf),)
-	$(Q)$(call rte_mkdir,     $(DESTDIR)$(docdir)/guides)
-	$(Q)cp $(CP_FLAGS) $O/doc/*/*/*pdf $(DESTDIR)$(docdir)/guides
-endif
-	$(Q)$(call rte_mkdir,         $(DESTDIR)$(datadir))
-	$(Q)cp $(CP_FLAGS) $(RTE_SDK)/examples $(DESTDIR)$(datadir)
diff --git a/mk/rte.sdkroot.mk b/mk/rte.sdkroot.mk
deleted file mode 100644
index fbee6e96d9..0000000000
--- a/mk/rte.sdkroot.mk
+++ /dev/null
@@ -1,115 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-MAKEFLAGS += --no-print-directory
-
-# define Q to '@' or not. $(Q) is used to prefix all shell commands to
-# be executed silently.
-Q=@
-ifeq '$V' '0'
-override V=
-endif
-ifdef V
-ifeq ("$(origin V)", "command line")
-Q=
-endif
-endif
-export Q
-
-ifeq ($(RTE_SDK),)
-$(error RTE_SDK is not defined)
-endif
-
-RTE_SRCDIR = $(CURDIR)
-export RTE_SRCDIR
-
-BUILDING_RTE_SDK := 1
-export BUILDING_RTE_SDK
-
-#
-# We can specify the configuration template when doing the "make
-# config". For instance: make config T=x86_64-native-linux-gcc
-#
-RTE_CONFIG_TEMPLATE :=
-ifdef T
-ifeq ("$(origin T)", "command line")
-RTE_CONFIG_TEMPLATE := $(RTE_SRCDIR)/config/defconfig_$(T)
-endif
-endif
-export RTE_CONFIG_TEMPLATE
-
-#
-# Default output is $(RTE_SRCDIR)/build
-# output files wil go in a separate directory
-#
-ifdef O
-ifeq ("$(origin O)", "command line")
-RTE_OUTPUT := $(abspath $(O))
-endif
-endif
-RTE_OUTPUT ?= $(RTE_SRCDIR)/build
-export RTE_OUTPUT
-
-# the directory where intermediate build files are stored, like *.o,
-# *.d, *.cmd, ...
-BUILDDIR = $(RTE_OUTPUT)/build
-export BUILDDIR
-
-export ROOTDIRS-y ROOTDIRS- ROOTDIRS-n
-
-.PHONY: default test-build
-default test-build: all
-
-.PHONY: warning
-warning:
-	@echo
-	@echo "=========================== WARNING ============================"
-	@echo "It is recommended to build DPDK using 'meson' and 'ninja'"
-	@echo "See https://doc.dpdk.org/guides/linux_gsg/build_dpdk.html"
-	@echo "Building DPDK with 'make' will be deprecated in a future release"
-	@echo "================================================================"
-	@echo
-	@test "$(MAKE_PAUSE)" = n || ( \
-	echo "This deprecation warning can be passed by adding MAKE_PAUSE=n"; \
-	echo "to 'make' command line or as an exported environment variable."; \
-	echo "Press enter to continue..."; read junk)
-
-.PHONY: config defconfig showconfigs showversion showversionum
-config: warning
-config defconfig showconfigs showversion showversionum:
-	$(Q)$(MAKE) -f $(RTE_SDK)/mk/rte.sdkconfig.mk $@
-
-.PHONY: cscope gtags tags etags
-cscope gtags tags etags:
-	$(Q)$(RTE_SDK)/devtools/build-tags.sh $@ $T
-
-.PHONY: test test-fast test-perf coverage test-drivers test-dump
-test test-fast test-perf coverage test-drivers test-dump:
-	$(Q)$(MAKE) -f $(RTE_SDK)/mk/rte.sdktest.mk $@
-
-.PHONY: install
-install:
-	$(Q)$(MAKE) -f $(RTE_SDK)/mk/rte.sdkinstall.mk pre_install
-	$(Q)$(MAKE) -f $(RTE_SDK)/mk/rte.sdkinstall.mk $@
-install-%:
-	$(Q)$(MAKE) -f $(RTE_SDK)/mk/rte.sdkinstall.mk $@
-
-.PHONY: doc help
-doc: doc-all
-help: doc-help
-doc-%:
-	$(Q)$(MAKE) -f $(RTE_SDK)/mk/rte.sdkdoc.mk $*
-
-.PHONY: gcov gcovclean
-gcov gcovclean:
-	$(Q)$(MAKE) -f $(RTE_SDK)/mk/rte.sdkgcov.mk $@
-
-.PHONY: examples examples_clean
-examples examples_clean:
-	$(Q)$(MAKE) -f $(RTE_SDK)/mk/rte.sdkexamples.mk $@
-
-# all other build targets
-%:
-	$(Q)$(MAKE) -f $(RTE_SDK)/mk/rte.sdkconfig.mk checkconfig
-	$(Q)$(MAKE) -f $(RTE_SDK)/mk/rte.sdkroot.mk warning
-	$(Q)$(MAKE) -f $(RTE_SDK)/mk/rte.sdkbuild.mk $@
diff --git a/mk/rte.sdktest.mk b/mk/rte.sdktest.mk
deleted file mode 100644
index 803018ba3a..0000000000
--- a/mk/rte.sdktest.mk
+++ /dev/null
@@ -1,76 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-ifeq (,$(wildcard $(RTE_OUTPUT)/.config))
-  $(error "need a make config first")
-else
-  include $(RTE_SDK)/mk/rte.vars.mk
-endif
-ifeq (,$(wildcard $(RTE_OUTPUT)/Makefile))
-  $(error "need a make config first")
-endif
-
-DATE := $(shell date '+%Y%m%d-%H%M')
-AUTOTEST_DIR := $(RTE_OUTPUT)/autotest-$(DATE)
-
-DIR := $(shell basename $(RTE_OUTPUT))
-
-#
-# test: launch auto-tests, very simple for now.
-#
-.PHONY: test test-fast test-perf test-drivers test-dump coverage
-
-PERFLIST=ring_perf,mempool_perf,memcpy_perf,hash_perf,timer_perf,\
-         reciprocal_division,reciprocal_division_perf,lpm_perf,red_all,\
-         barrier,hash_multiwriter,timer_racecond,efd,hash_functions,\
-         eventdev_selftest_sw,member_perf,efd_perf,lpm6_perf,red_perf,\
-         distributor_perf,ring_pmd_perf,pmd_perf,ring_perf
-DRIVERSLIST=link_bonding,link_bonding_mode4,link_bonding_rssconf,\
-            cryptodev_sw_mrvl,cryptodev_dpaa2_sec,cryptodev_dpaa_sec,\
-            cryptodev_qat,cryptodev_aesni_mb,cryptodev_openssl,\
-            cryptodev_scheduler,cryptodev_aesni_gcm,cryptodev_null,\
-            cryptodev_sw_snow3g,cryptodev_sw_kasumi,cryptodev_sw_zuc
-DUMPLIST=dump_struct_sizes,dump_mempool,dump_malloc_stats,dump_devargs,\
-         dump_log_types,dump_ring,dump_physmem,dump_memzone
-
-SPACESTR:=
-SPACESTR+=
-STRIPPED_PERFLIST=$(subst $(SPACESTR),,$(PERFLIST))
-STRIPPED_DRIVERSLIST=$(subst $(SPACESTR),,$(DRIVERSLIST))
-STRIPPED_DUMPLIST=$(subst $(SPACESTR),,$(DUMPLIST))
-
-coverage: BLACKLIST=-$(STRIPPED_PERFLIST)
-test-fast: BLACKLIST=-$(STRIPPED_PERFLIST),$(STRIPPED_DRIVERSLIST),$(STRIPPED_DUMPLIST)
-test-perf: WHITELIST=$(STRIPPED_PERFLIST)
-test-drivers: WHITELIST=$(STRIPPED_DRIVERSLIST)
-test-dump: WHITELIST=$(STRIPPED_DUMPLIST)
-
-test test-fast test-perf test-drivers test-dump:
-	@mkdir -p $(AUTOTEST_DIR) ; \
-	cd $(AUTOTEST_DIR) ; \
-	if [ -f $(RTE_OUTPUT)/app/test ]; then \
-		python $(RTE_SDK)/app/test/autotest.py \
-			$(RTE_OUTPUT)/app/test \
-			$(RTE_TARGET) \
-			$(BLACKLIST) $(WHITELIST); \
-	else \
-		echo "No test found, please do a 'make' first, or specify O=" ; \
-	fi
-
-# this is a special target to ease the pain of running coverage tests
-# this runs all the autotests, cmdline_test script and dpdk-procinfo
-coverage:
-	@mkdir -p $(AUTOTEST_DIR) ; \
-	cd $(AUTOTEST_DIR) ; \
-	if [ -f $(RTE_OUTPUT)/app/test ]; then \
-		python $(RTE_SDK)/test/cmdline_test/cmdline_test.py \
-			$(RTE_OUTPUT)/app/cmdline_test; \
-		ulimit -S -n 100 ; \
-		python $(RTE_SDK)/app/test/autotest.py \
-			$(RTE_OUTPUT)/app/test \
-			$(RTE_TARGET) \
-			$(BLACKLIST) $(WHITELIST) ; \
-		$(RTE_OUTPUT)/app/dpdk-procinfo --file-prefix=ring_perf -- -m; \
-	else \
-		echo "No test found, please do a 'make' first, or specify O=" ;\
-	fi
diff --git a/mk/rte.shared.mk b/mk/rte.shared.mk
deleted file mode 100644
index 2b501ddb84..0000000000
--- a/mk/rte.shared.mk
+++ /dev/null
@@ -1,108 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2012-2013 6WIND S.A.
-
-include $(RTE_SDK)/mk/internal/rte.compile-pre.mk
-include $(RTE_SDK)/mk/internal/rte.install-pre.mk
-include $(RTE_SDK)/mk/internal/rte.clean-pre.mk
-include $(RTE_SDK)/mk/internal/rte.build-pre.mk
-
-# VPATH contains at least SRCDIR
-VPATH += $(SRCDIR)
-
-_BUILD = $(SHARED)
-_INSTALL = $(INSTALL-FILES-y) $(SYMLINK-FILES-y) $(RTE_OUTPUT)/lib/$(SHARED)
-_CLEAN = doclean
-
-# Set fPIC in CFLAGS for .so generation
-CFLAGS += -fPIC
-
-.PHONY: all
-all: install
-
-.PHONY: install
-install: build _postinstall
-
-_postinstall: build
-
-.PHONY: build
-build: _postbuild
-
-exe2cmd = $(strip $(call dotfile,$(patsubst %,%.cmd,$(1))))
-
-ifeq ($(LINK_USING_CC),1)
-override EXTRA_LDFLAGS := $(call linkerprefix,$(EXTRA_LDFLAGS))
-O_TO_SO = $(CC) $(call linkerprefix,$(LDFLAGS)) $(LDFLAGS_$(@)) $(EXTRA_LDFLAGS) \
-	-shared -o $@ $(OBJS-y) $(call linkerprefix,$(LDLIBS))
-else
-O_TO_SO = $(LD) $(LDFLAGS) $(LDFLAGS_$(@)) $(EXTRA_LDFLAGS) \
-	-shared -o $@ $(OBJS-y) $(LDLIBS)
-endif
-
-O_TO_SO_STR = $(subst ','\'',$(O_TO_SO)) #'# fix syntax highlight
-O_TO_SO_DISP = $(if $(V),"$(O_TO_SO_STR)","  LD $(@)")
-O_TO_SO_CMD = "cmd_$@ = $(O_TO_SO_STR)"
-O_TO_SO_DO = @set -e; \
-	echo $(O_TO_SO_DISP); \
-	$(O_TO_SO) && \
-	echo $(O_TO_SO_CMD) > $(call exe2cmd,$(@))
-
--include .$(SHARED).cmd
-
-# path where libraries are retrieved
-LDLIBS_PATH := $(subst -Wl$(comma)-L,,$(filter -Wl$(comma)-L%,$(LDLIBS)))
-LDLIBS_PATH += $(subst -L,,$(filter -L%,$(LDLIBS)))
-
-# list of .a files that are linked to this application
-LDLIBS_NAMES := $(patsubst -l%,lib%.a,$(filter -l%,$(LDLIBS)))
-LDLIBS_NAMES += $(patsubst -Wl$(comma)-l%,lib%.a,$(filter -Wl$(comma)-l%,$(LDLIBS)))
-
-# list of found libraries files (useful for deps). If not found, the
-# library is silently ignored and dep won't be checked
-LDLIBS_FILES := $(sort $(wildcard $(foreach dir,$(LDLIBS_PATH),\
-	$(addprefix $(dir)/,$(LDLIBS_NAMES)))))
-
-#
-# Archive objects in .so file if needed
-#
-$(SHARED): $(OBJS-y) $(LDLIBS_FILES) $(DEP_$(SHARED)) FORCE
-	@[ -d $(dir $@) ] || mkdir -p $(dir $@)
-	$(if $(D),\
-		@echo -n "$< -> $@ " ; \
-		echo -n "file_missing=$(call boolean,$(file_missing)) " ; \
-		echo -n "cmdline_changed=$(call boolean,$(call cmdline_changed,$(O_TO_SO_STR))) " ; \
-		echo -n "depfile_missing=$(call boolean,$(depfile_missing)) " ; \
-		echo "depfile_newer=$(call boolean,$(depfile_newer)) ")
-	$(if $(or \
-		$(file_missing),\
-		$(call cmdline_changed,$(O_TO_SO_STR)),\
-		$(depfile_missing),\
-		$(depfile_newer)),\
-		$(O_TO_SO_DO))
-
-#
-# install lib in $(RTE_OUTPUT)/lib
-#
-$(RTE_OUTPUT)/lib/$(SHARED): $(SHARED)
-	@echo "  INSTALL-SHARED $(SHARED)"
-	@[ -d $(RTE_OUTPUT)/lib ] || mkdir -p $(RTE_OUTPUT)/lib
-	$(Q)cp -f $(SHARED) $(RTE_OUTPUT)/lib
-
-#
-# Clean all generated files
-#
-.PHONY: clean
-clean: _postclean
-
-.PHONY: doclean
-doclean:
-	$(Q)rm -rf $(SHARED) $(OBJS-all) $(DEPS-all) $(DEPSTMP-all) \
-	  $(CMDS-all) $(INSTALL-FILES-all)
-	$(Q)rm -f $(_BUILD_TARGETS) $(_INSTALL_TARGETS) $(_CLEAN_TARGETS)
-
-include $(RTE_SDK)/mk/internal/rte.compile-post.mk
-include $(RTE_SDK)/mk/internal/rte.install-post.mk
-include $(RTE_SDK)/mk/internal/rte.clean-post.mk
-include $(RTE_SDK)/mk/internal/rte.build-post.mk
-
-.PHONY: FORCE
-FORCE:
diff --git a/mk/rte.subdir.mk b/mk/rte.subdir.mk
deleted file mode 100644
index d6e64a2460..0000000000
--- a/mk/rte.subdir.mk
+++ /dev/null
@@ -1,65 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-#
-# .mk to build subdirectories
-#
-
-include $(RTE_SDK)/mk/internal/rte.install-pre.mk
-include $(RTE_SDK)/mk/internal/rte.clean-pre.mk
-include $(RTE_SDK)/mk/internal/rte.build-pre.mk
-
-ALL_DEPDIRS := $(patsubst DEPDIRS-%,%,$(filter DEPDIRS-%,$(.VARIABLES)))
-
-CLEANDIRS = $(addsuffix _clean,$(DIRS-y) $(DIRS-n) $(DIRS-))
-
-VPATH += $(SRCDIR)
-_BUILD = $(DIRS-y)
-_INSTALL = $(INSTALL-FILES-y) $(SYMLINK-FILES-y)
-_CLEAN = $(CLEANDIRS)
-
-.PHONY: all
-all: install
-
-.PHONY: install
-install: build _postinstall
-
-_postinstall: build
-
-.PHONY: build
-build: _postbuild
-
-.SECONDEXPANSION:
-.PHONY: $(DIRS-y)
-$(DIRS-y):
-	@[ -d $(CURDIR)/$@ ] || mkdir -p $(CURDIR)/$@
-	@echo "== Build $S/$@"
-	@$(MAKE) S=$S/$@ -f $(SRCDIR)/$@/Makefile -C $(CURDIR)/$@ all
-
-.PHONY: clean
-clean: _postclean
-
-%_clean:
-	@echo "== Clean $S/$*"
-	@if [ -f $(SRCDIR)/$*/Makefile -a -d $(CURDIR)/$* ]; then \
-		$(MAKE) S=$S/$* -f $(SRCDIR)/$*/Makefile -C $(CURDIR)/$* clean ; \
-	fi
-	@rm -f $(_BUILD_TARGETS) $(_INSTALL_TARGETS) $(_CLEAN_TARGETS)
-
-define depdirs_rule
-$(DEPDIRS-$(1)):
-
-$(1): | $(DEPDIRS-$(1))
-
-$(if $(D),$(info $(1) depends on $(DEPDIRS-$(1))))
-endef
-
-$(foreach dir,$(ALL_DEPDIRS),\
-	$(eval $(call depdirs_rule,$(dir))))
-
-include $(RTE_SDK)/mk/internal/rte.install-post.mk
-include $(RTE_SDK)/mk/internal/rte.clean-post.mk
-include $(RTE_SDK)/mk/internal/rte.build-post.mk
-
-.PHONY: FORCE
-FORCE:
diff --git a/mk/rte.vars.mk b/mk/rte.vars.mk
deleted file mode 100644
index 07b0db127f..0000000000
--- a/mk/rte.vars.mk
+++ /dev/null
@@ -1,102 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-#
-# To be included at the beginning of all RTE user Makefiles. This
-# .mk will define the RTE environment variables by including the
-# config file of SDK. It also includes the config file from external
-# application if any.
-#
-
-ifeq ($(RTE_SDK),)
-$(error RTE_SDK is not defined)
-endif
-ifeq ($(wildcard $(RTE_SDK)),)
-$(error RTE_SDK variable points to an invalid location)
-endif
-
-# define Q to '@' or not. $(Q) is used to prefix all shell commands to
-# be executed silently.
-Q=@
-ifeq '$V' '0'
-override V=
-endif
-ifdef V
-ifeq ("$(origin V)", "command line")
-Q=
-endif
-endif
-export Q
-
-# if we are building SDK, only includes SDK configuration
-ifneq ($(BUILDING_RTE_SDK),)
-  include $(RTE_OUTPUT)/.config
-  # remove double-quotes from config names
-  RTE_ARCH := $(CONFIG_RTE_ARCH:"%"=%)
-  RTE_MACHINE := $(CONFIG_RTE_MACHINE:"%"=%)
-  RTE_EXEC_ENV := $(CONFIG_RTE_EXEC_ENV:"%"=%)
-  RTE_TOOLCHAIN := $(CONFIG_RTE_TOOLCHAIN:"%"=%)
-  RTE_SDK_BIN := $(RTE_OUTPUT)
-endif
-
-RTE_TARGET ?= $(RTE_ARCH)-$(RTE_MACHINE)-$(RTE_EXEC_ENV)-$(RTE_TOOLCHAIN)
-
-ifeq ($(BUILDING_RTE_SDK),)
-# if we are building an external app/lib, include internal/rte.extvars.mk that will
-# define RTE_OUTPUT, RTE_SRCDIR, RTE_EXTMK, RTE_SDK_BIN, (etc ...)
-include $(RTE_SDK)/mk/internal/rte.extvars.mk
-endif
-
-CONFIG_RTE_LIBRTE_E1000_PMD = $(CONFIG_RTE_LIBRTE_IGB_PMD)
-ifneq ($(CONFIG_RTE_LIBRTE_E1000_PMD),y)
-  CONFIG_RTE_LIBRTE_E1000_PMD = $(CONFIG_RTE_LIBRTE_EM_PMD)
-endif
-
-ifeq ($(RTE_ARCH),)
-$(error RTE_ARCH is not defined)
-endif
-
-ifeq ($(RTE_MACHINE),)
-$(error RTE_MACHINE is not defined)
-endif
-
-ifeq ($(RTE_EXEC_ENV),)
-$(error RTE_EXEC_ENV is not defined)
-endif
-
-ifeq ($(RTE_TOOLCHAIN),)
-$(error RTE_TOOLCHAIN is not defined)
-endif
-
-# can be overridden by make command line or exported environment variable
-RTE_KERNELDIR ?= /lib/modules/$(shell uname -r)/build
-
-export RTE_TARGET
-export RTE_ARCH
-export RTE_MACHINE
-export RTE_EXEC_ENV
-export RTE_TOOLCHAIN
-
-# developer build automatically enabled in a git tree
-ifneq ($(wildcard $(RTE_SDK)/.git),)
-RTE_DEVEL_BUILD ?= y
-endif
-
-# SRCDIR is the current source directory
-ifdef S
-SRCDIR := $(abspath $(RTE_SRCDIR)/$(S))
-else
-SRCDIR := $(RTE_SRCDIR)
-endif
-
-# helper: return y if option is set to y, else return an empty string
-testopt = $(if $(strip $(subst y,,$(1)) $(subst $(1),,y)),,y)
-
-# helper: return an empty string if option is set, else return y
-not = $(if $(strip $(subst y,,$(1)) $(subst $(1),,y)),,y)
-
-ifneq ($(wildcard $(RTE_SDK)/mk/target/$(RTE_TARGET)/rte.vars.mk),)
-include $(RTE_SDK)/mk/target/$(RTE_TARGET)/rte.vars.mk
-else
-include $(RTE_SDK)/mk/target/generic/rte.vars.mk
-endif
diff --git a/mk/target/generic/rte.app.mk b/mk/target/generic/rte.app.mk
deleted file mode 100644
index ed82656f18..0000000000
--- a/mk/target/generic/rte.app.mk
+++ /dev/null
@@ -1,13 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-#
-# define Makefile targets that are specific to an environment.
-#
-include $(RTE_SDK)/mk/exec-env/$(RTE_EXEC_ENV)/rte.app.mk
-
-.PHONY: exec-env-appinstall
-target-appinstall: exec-env-appinstall
-
-.PHONY: exec-env-appclean
-target-appclean: exec-env-appclean
diff --git a/mk/target/generic/rte.vars.mk b/mk/target/generic/rte.vars.mk
deleted file mode 100644
index 11b0418e55..0000000000
--- a/mk/target/generic/rte.vars.mk
+++ /dev/null
@@ -1,132 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-#
-# This .mk is the generic target rte.var.mk ; it includes .mk for
-# the specified machine, architecture, toolchain (compiler) and
-# executive environment.
-#
-
-#
-# toolchain:
-#
-#   - define CC, LD, AR, AS, ...
-#   - define TOOLCHAIN_CFLAGS variable (overridden by cmdline value)
-#   - define TOOLCHAIN_LDFLAGS variable (overridden by cmdline value)
-#   - define TOOLCHAIN_ASFLAGS variable (overridden by cmdline value)
-#   - may override any previously defined variable
-#
-include $(RTE_SDK)/mk/toolchain/$(RTE_TOOLCHAIN)/rte.vars.mk
-
-#
-# machine:
-#
-#   - can define ARCH variable (overridden by cmdline value)
-#   - can define CROSS variable (overridden by cmdline value)
-#   - define MACHINE_CFLAGS variable (overridden by cmdline value)
-#   - define MACHINE_LDFLAGS variable (overridden by cmdline value)
-#   - define MACHINE_ASFLAGS variable (overridden by cmdline value)
-#   - can define CPU_CFLAGS variable (overridden by cmdline value) that
-#     overrides the one defined in arch.
-#   - can define CPU_LDFLAGS variable (overridden by cmdline value) that
-#     overrides the one defined in arch.
-#   - can define CPU_ASFLAGS variable (overridden by cmdline value) that
-#     overrides the one defined in arch.
-#
-ifneq ($(wildcard $(RTE_SDK)/mk/machine/$(RTE_MACHINE)/rte.vars.mk),)
-include $(RTE_SDK)/mk/machine/$(RTE_MACHINE)/rte.vars.mk
-else
-MACHINE_CFLAGS := -march=$(RTE_MACHINE)
-endif
-
-#
-# arch:
-#
-#   - define ARCH variable (overridden by cmdline or by previous
-#     optional define in machine .mk)
-#   - define CROSS variable (overridden by cmdline or previous define
-#     in machine .mk)
-#   - define CPU_CFLAGS variable (overridden by cmdline or previous
-#     define in machine .mk)
-#   - define CPU_LDFLAGS variable (overridden by cmdline or previous
-#     define in machine .mk)
-#   - define CPU_ASFLAGS variable (overridden by cmdline or previous
-#     define in machine .mk)
-#   - may override any previously defined variable
-#
-include $(RTE_SDK)/mk/arch/$(RTE_ARCH)/rte.vars.mk
-
-#
-# exec-env:
-#
-#   - define EXECENV_CFLAGS variable (overridden by cmdline)
-#   - define EXECENV_LDFLAGS variable (overridden by cmdline)
-#   - define EXECENV_ASFLAGS variable (overridden by cmdline)
-#   - may override any previously defined variable
-#
-include $(RTE_SDK)/mk/exec-env/$(RTE_EXEC_ENV)/rte.vars.mk
-
-# Don't set CFLAGS/LDFLAGS flags for kernel module, all flags are
-# provided by Kbuild framework.
-ifeq ($(KERNELRELEASE),)
-
-# now that the environment is mostly set up, including the machine type we will
-# be passing to the compiler, set up the specific CPU flags based on that info.
-include $(RTE_SDK)/mk/rte.cpuflags.mk
-
-# merge all CFLAGS
-CFLAGS := $(CPU_CFLAGS) $(EXECENV_CFLAGS) $(TOOLCHAIN_CFLAGS) $(MACHINE_CFLAGS)
-CFLAGS += $(TARGET_CFLAGS)
-
-# merge all LDFLAGS
-LDFLAGS := $(CPU_LDFLAGS) $(EXECENV_LDFLAGS) $(TOOLCHAIN_LDFLAGS) $(MACHINE_LDFLAGS)
-LDFLAGS += $(TARGET_LDFLAGS)
-
-# merge all ASFLAGS
-ASFLAGS := $(CPU_ASFLAGS) $(EXECENV_ASFLAGS) $(TOOLCHAIN_ASFLAGS) $(MACHINE_ASFLAGS)
-ASFLAGS += $(TARGET_ASFLAGS)
-
-# add default include and lib paths
-CFLAGS += -I$(RTE_OUTPUT)/include
-LDFLAGS += -L$(RTE_OUTPUT)/lib
-
-# add in flag for supporting function versioning. The define is used in meson
-# builds to ensure that the user has properly flagged the unit in question as
-# using function versioning so it can be built twice - once for static lib and
-# then a second time for the shared lib. Since make only builds one library
-# type at a time, such precautions aren't necessary, so we can globally define
-# the flag
-CFLAGS += -DRTE_USE_FUNCTION_VERSIONING
-
-# always include rte_config.h: the one in $(RTE_OUTPUT)/include is
-# the configuration of SDK when $(BUILDING_RTE_SDK) is true, or the
-# configuration of the application if $(BUILDING_RTE_SDK) is not
-# defined.
-ifeq ($(BUILDING_RTE_SDK),1)
-# building sdk
-CFLAGS += -include $(RTE_OUTPUT)/include/rte_config.h
-CFLAGS += -DALLOW_EXPERIMENTAL_API
-CFLAGS += -DALLOW_INTERNAL_API
-else
-# if we are building an external application, include SDK's lib and
-# includes too
-CFLAGS += -I$(RTE_SDK_BIN)/include
-ifneq ($(wildcard $(RTE_OUTPUT)/include/rte_config.h),)
-CFLAGS += -include $(RTE_OUTPUT)/include/rte_config.h
-endif
-CFLAGS += -include $(RTE_SDK_BIN)/include/rte_config.h
-LDFLAGS += -L$(RTE_SDK_BIN)/lib
-endif
-
-# always define _GNU_SOURCE
-CFLAGS += -D_GNU_SOURCE
-
-# define __BSD_VISIBLE when building for FreeBSD
-ifeq ($(CONFIG_RTE_EXEC_ENV_FREEBSD),y)
-CFLAGS += -D__BSD_VISIBLE
-endif
-
-export CFLAGS
-export LDFLAGS
-
-endif
diff --git a/mk/toolchain/clang/rte.toolchain-compat.mk b/mk/toolchain/clang/rte.toolchain-compat.mk
deleted file mode 100644
index e6189b498d..0000000000
--- a/mk/toolchain/clang/rte.toolchain-compat.mk
+++ /dev/null
@@ -1,22 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-#
-# CPUID-related options
-#
-# This was added to support compiler versions which might not support all the
-# flags we need
-#
-
-# find out CLANG version
-
-CLANG_VERSION := $(shell $(CC) -v 2>&1 | \
-	sed -n "s/.*version \([0-9]*\.[0-9]*\).*/\1/p")
-
-CLANG_MAJOR_VERSION := $(shell echo $(CLANG_VERSION) | cut -f1 -d.)
-
-CLANG_MINOR_VERSION := $(shell echo $(CLANG_VERSION) | cut -f2 -d.)
-
-ifeq ($(shell test $(CLANG_MAJOR_VERSION)$(CLANG_MINOR_VERSION) -lt 35 && echo 1), 1)
-	CC_SUPPORTS_Z := false
-endif
diff --git a/mk/toolchain/clang/rte.vars.mk b/mk/toolchain/clang/rte.vars.mk
deleted file mode 100644
index d441f6d8f3..0000000000
--- a/mk/toolchain/clang/rte.vars.mk
+++ /dev/null
@@ -1,60 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-#
-# toolchain:
-#
-#   - define CC, LD, AR, AS, ... (overridden by cmdline value)
-#   - define TOOLCHAIN_CFLAGS variable (overridden by cmdline value)
-#   - define TOOLCHAIN_LDFLAGS variable (overridden by cmdline value)
-#   - define TOOLCHAIN_ASFLAGS variable (overridden by cmdline value)
-#
-
-CC        = $(CROSS)clang
-KERNELCC  = $(CROSS)gcc
-CPP       = $(CROSS)cpp
-# for now, we don't use as but nasm.
-# AS      = $(CROSS)as
-AS        = nasm
-AR        = $(CROSS)ar
-LD        = $(CROSS)ld
-OBJCOPY   = $(CROSS)objcopy
-OBJDUMP   = $(CROSS)objdump
-STRIP     = $(CROSS)strip
-READELF   = $(CROSS)readelf
-GCOV      = $(CROSS)gcov
-
-ifeq ("$(origin CC)", "command line")
-HOSTCC    = $(CC)
-else
-HOSTCC    = clang
-endif
-HOSTAS    = as
-
-TOOLCHAIN_ASFLAGS =
-TOOLCHAIN_CFLAGS =
-TOOLCHAIN_LDFLAGS =
-
-WERROR_FLAGS := -W -Wall -Wstrict-prototypes -Wmissing-prototypes
-WERROR_FLAGS += -Wmissing-declarations -Wold-style-definition -Wpointer-arith
-WERROR_FLAGS += -Wnested-externs -Wcast-qual
-WERROR_FLAGS += -Wformat-nonliteral -Wformat-security
-WERROR_FLAGS += -Wundef -Wwrite-strings -Wdeprecated
-
-ifeq ($(RTE_DEVEL_BUILD),y)
-WERROR_FLAGS += -Werror
-endif
-
-# process cpu flags
-include $(RTE_SDK)/mk/toolchain/$(RTE_TOOLCHAIN)/rte.toolchain-compat.mk
-
-# disable warning for non-initialised fields
-WERROR_FLAGS += -Wno-missing-field-initializers
-
-# disable packed member unalign warnings
-ifeq ($(shell test $(CLANG_MAJOR_VERSION) -ge 4 && echo 1), 1)
-WERROR_FLAGS += -Wno-address-of-packed-member
-endif
-
-export CC AS AR LD OBJCOPY OBJDUMP STRIP READELF
-export TOOLCHAIN_CFLAGS TOOLCHAIN_LDFLAGS TOOLCHAIN_ASFLAGS
diff --git a/mk/toolchain/gcc/rte.toolchain-compat.mk b/mk/toolchain/gcc/rte.toolchain-compat.mk
deleted file mode 100644
index 98dca3e786..0000000000
--- a/mk/toolchain/gcc/rte.toolchain-compat.mk
+++ /dev/null
@@ -1,120 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-#
-# CPUID-related options
-#
-# This was added to support compiler versions which might not support all the
-# flags we need
-#
-
-#find out GCC version
-
-GCC_MAJOR = $(shell echo __GNUC__ | $(CC) -E -x c - | tail -n 1)
-GCC_MINOR = $(shell echo __GNUC_MINOR__ | $(CC) -E -x c - | tail -n 1)
-GCC_PATCHLEVEL = $(shell echo __GNUC_PATCHLEVEL__ | $(CC) -E -x c - | tail -n 1)
-GCC_VERSION = $(GCC_MAJOR)$(GCC_MINOR)
-
-HOST_GCC_MAJOR = $(shell echo __GNUC__ | $(HOSTCC) -E -x c - | tail -n 1)
-HOST_GCC_MINOR = $(shell echo __GNUC_MINOR__ | $(HOSTCC) -E -x c - | tail -n 1)
-HOST_GCC_PATCHLEVEL = $(shell echo __GNUC_PATCHLEVEL__ | $(HOSTCC) -E -x c - | tail -n 1)
-HOST_GCC_VERSION = $(HOST_GCC_MAJOR)$(HOST_GCC_MINOR)
-
-LD_VERSION = $(shell $(LD) -v)
-# disable AVX512F support for GCC & binutils 2.30 as a workaround for Bug 97
-ifeq ($(CONFIG_RTE_ARCH_X86), y)
-ifneq ($(filter 2.30%,$(LD_VERSION)),)
-FORCE_DISABLE_AVX512 := y
-# print warning only once for librte_eal
-ifneq ($(filter %librte_eal,$(CURDIR)),)
-$(warning AVX512 support disabled because of binutils 2.30. See Bug 97)
-endif
-endif
-ifneq ($(filter 2.31%,$(LD_VERSION)),)
-FORCE_DISABLE_AVX512 := y
-# print warning only once for librte_eal
-ifneq ($(filter %librte_eal,$(CURDIR)),)
-$(warning AVX512 support disabled because of binutils 2.31. See Bug 249)
-endif
-endif
-endif
-
-# if GCC is older than 4.x
-ifeq ($(shell test $(GCC_VERSION) -lt 40 && echo 1), 1)
-	MACHINE_CFLAGS =
-$(warning You are using GCC < 4.x. This is neither supported, nor tested.)
-
-
-else
-# GCC graceful degradation
-# GCC 4.2.x - added support for generic target
-# GCC 4.3.x - added support for core2, ssse3, sse4.1, sse4.2
-# GCC 4.4.x - added support for avx, aes, pclmul
-# GCC 4.5.x - added support for atom
-# GCC 4.6.x - added support for corei7, corei7-avx
-# GCC 4.7.x - added support for fsgsbase, rdrnd, f16c, core-avx-i, core-avx2
-# GCC 4.9.x - added support for armv8-a+crc
-#
-	ifeq ($(shell test $(GCC_VERSION) -le 49 && echo 1), 1)
-		MACHINE_CFLAGS := $(patsubst -march=armv8-a+crc,-march=armv8-a+crc -D__ARM_FEATURE_CRC32=1,$(MACHINE_CFLAGS))
-		MACHINE_CFLAGS := $(patsubst -march=armv8-a+crc+crypto,-march=armv8-a+crc+crypto -D__ARM_FEATURE_CRC32=1,$(MACHINE_CFLAGS))
-	endif
-	ifeq ($(shell test $(GCC_VERSION) -le 47 && echo 1), 1)
-		MACHINE_CFLAGS := $(patsubst -march=core-avx-i,-march=corei7-avx,$(MACHINE_CFLAGS))
-		MACHINE_CFLAGS := $(patsubst -march=core-avx2,-march=core-avx2,$(MACHINE_CFLAGS))
-	endif
-	ifeq ($(shell test $(GCC_VERSION) -lt 46 && echo 1), 1)
-		MACHINE_CFLAGS := $(patsubst -march=corei7-avx,-march=core2 -maes -mpclmul -mavx,$(MACHINE_CFLAGS))
-		MACHINE_CFLAGS := $(patsubst -march=corei7,-march=core2 -maes -mpclmul,$(MACHINE_CFLAGS))
-	endif
-	ifeq ($(shell test $(GCC_VERSION) -lt 45 && echo 1), 1)
-		MACHINE_CFLAGS := $(patsubst -march=atom,-march=core2 -mssse3,$(MACHINE_CFLAGS))
-	endif
-	ifeq ($(shell test $(GCC_VERSION) -lt 44 && echo 1), 1)
-		MACHINE_CFLAGS := $(filter-out -mavx -mpclmul -maes,$(MACHINE_CFLAGS))
-		ifneq ($(findstring SSE4_2, $(CPUFLAGS)),)
-			MACHINE_CFLAGS += -msse4.2
-		endif
-		ifneq ($(findstring SSE4_1, $(CPUFLAGS)),)
-			MACHINE_CFLAGS += -msse4.1
-		endif
-	endif
-	ifeq ($(shell test $(GCC_VERSION) -lt 43 && echo 1), 1)
-		MACHINE_CFLAGS := $(filter-out -msse% -mssse%,$(MACHINE_CFLAGS))
-		MACHINE_CFLAGS := $(patsubst -march=core2,-march=generic,$(MACHINE_CFLAGS))
-		MACHINE_CFLAGS += -msse3
-	endif
-	ifeq ($(shell test $(GCC_VERSION) -lt 42 && echo 1), 1)
-		MACHINE_CFLAGS := $(filter-out -march% -mtune% -msse%,$(MACHINE_CFLAGS))
-	endif
-
-	ifeq ($(shell test $(GCC_VERSION) -lt 74 && echo 1), 1)
-		CONFIG_RTE_ENABLE_LTO=n
-	endif
-
-	# Disable thunderx PMD for gcc < 4.7
-	ifeq ($(shell test $(GCC_VERSION) -lt 47 && echo 1), 1)
-		CONFIG_RTE_LIBRTE_THUNDERX_NICVF_PMD=d
-	endif
-
-	# Disable OPDL PMD for gcc < 4.7
-	ifeq ($(shell test $(GCC_VERSION) -lt 47 && echo 1), 1)
-		CONFIG_RTE_LIBRTE_PMD_OPDL_EVENTDEV=d
-	endif
-
-	# Disable OCTEON drivers and libs for arm64 gcc < 4.8.6
-	ifeq ($(RTE_ARCH), arm64)
-	ifeq ($(shell test $(GCC_VERSION)$(GCC_PATCHLEVEL) -lt 486 && echo 1), 1)
-		CONFIG_RTE_LIBRTE_PMD_OCTEONTX_SSOVF=d
-		CONFIG_RTE_LIBRTE_OCTEONTX_MEMPOOL=d
-		CONFIG_RTE_LIBRTE_OCTEONTX_PMD=d
-		CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_DMA_RAWDEV=d
-		CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EP_RAWDEV=d
-		CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EVENTDEV=d
-		CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_CRYPTO=d
-		CONFIG_RTE_LIBRTE_OCTEONTX2_MEMPOOL=d
-		CONFIG_RTE_LIBRTE_OCTEONTX2_PMD=d
-	endif
-	endif
-
-endif
diff --git a/mk/toolchain/gcc/rte.vars.mk b/mk/toolchain/gcc/rte.vars.mk
deleted file mode 100644
index 928f0e0830..0000000000
--- a/mk/toolchain/gcc/rte.vars.mk
+++ /dev/null
@@ -1,109 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-#
-# toolchain:
-#
-#   - define CC, LD, AR, AS, ... (overridden by cmdline value)
-#   - define TOOLCHAIN_CFLAGS variable (overridden by cmdline value)
-#   - define TOOLCHAIN_LDFLAGS variable (overridden by cmdline value)
-#   - define TOOLCHAIN_ASFLAGS variable (overridden by cmdline value)
-#
-
-CC        = $(CROSS)gcc
-KERNELCC  = $(CROSS)gcc
-CPP       = $(CROSS)cpp
-# for now, we don't use as but nasm.
-# AS      = $(CROSS)as
-AS        = nasm
-AR        = $(CROSS)ar
-LD        = $(CROSS)ld
-OBJCOPY   = $(CROSS)objcopy
-OBJDUMP   = $(CROSS)objdump
-STRIP     = $(CROSS)strip
-READELF   = $(CROSS)readelf
-GCOV      = $(CROSS)gcov
-
-ifeq ("$(origin CC)", "command line")
-HOSTCC    = $(CC)
-else
-HOSTCC    = gcc
-endif
-HOSTAS    = as
-
-TOOLCHAIN_ASFLAGS =
-TOOLCHAIN_CFLAGS =
-TOOLCHAIN_LDFLAGS =
-
-ifeq ($(CONFIG_RTE_LIBRTE_GCOV),y)
-TOOLCHAIN_CFLAGS += --coverage
-TOOLCHAIN_LDFLAGS += --coverage
-ifeq (,$(findstring -O0,$(EXTRA_CFLAGS)))
-  $(warning "EXTRA_CFLAGS doesn't contains -O0, coverage will be inaccurate with optimizations enabled")
-endif
-endif
-
-WERROR_FLAGS := -W -Wall -Wstrict-prototypes -Wmissing-prototypes
-WERROR_FLAGS += -Wmissing-declarations -Wold-style-definition -Wpointer-arith
-WERROR_FLAGS += -Wcast-align -Wnested-externs -Wcast-qual
-WERROR_FLAGS += -Wformat-nonliteral -Wformat-security
-WERROR_FLAGS += -Wundef -Wwrite-strings -Wdeprecated
-
-ifeq ($(RTE_DEVEL_BUILD),y)
-WERROR_FLAGS += -Werror
-endif
-
-# There are many issues reported for strict alignment architectures
-# which are not necessarily fatal. Report as warnings.
-ifeq ($(CONFIG_RTE_ARCH_STRICT_ALIGN),y)
-WERROR_FLAGS += -Wno-error=cast-align
-endif
-
-# process cpu flags
-include $(RTE_SDK)/mk/toolchain/$(RTE_TOOLCHAIN)/rte.toolchain-compat.mk
-
-ifeq ($(CONFIG_RTE_ENABLE_LTO),y)
-# 'fat-lto' is used since pmdinfogen needs to have 'this_pmd_nameX'
-# exported in symbol table and without this option only internal
-# representation is present.
-TOOLCHAIN_CFLAGS += -flto -ffat-lto-objects
-TOOLCHAIN_LDFLAGS += -flto
-# workaround for GCC bug 81440
-ifeq ($(shell test $(GCC_VERSION) -lt 80 && echo 1), 1)
-WERROR_FLAGS += -Wno-lto-type-mismatch
-endif
-endif
-
-# disable warning for non-initialised fields
-WERROR_FLAGS += -Wno-missing-field-initializers
-# workaround GCC bug with warning "may be used uninitialized"
-ifeq ($(shell test $(GCC_VERSION) -lt 47 && echo 1), 1)
-WERROR_FLAGS += -Wno-uninitialized
-endif
-
-ifeq ($(shell test $(GCC_VERSION) -ge 100 && echo 1), 1)
-# FIXME: Bugzilla 396
-WERROR_FLAGS += -Wno-zero-length-bounds
-endif
-
-HOST_WERROR_FLAGS := $(WERROR_FLAGS)
-
-ifeq ($(shell test $(HOST_GCC_VERSION) -gt 70 && echo 1), 1)
-# Tell GCC only to error for switch fallthroughs without a suitable comment
-HOST_WERROR_FLAGS += -Wimplicit-fallthrough=2
-# Ignore errors for snprintf truncation
-HOST_WERROR_FLAGS += -Wno-format-truncation
-endif
-
-ifeq ($(shell test $(GCC_VERSION) -gt 70 && echo 1), 1)
-# Tell GCC only to error for switch fallthroughs without a suitable comment
-WERROR_FLAGS += -Wimplicit-fallthrough=2
-# Ignore errors for snprintf truncation
-WERROR_FLAGS += -Wno-format-truncation
-endif
-
-# disable packed member unalign warnings
-WERROR_FLAGS += -Wno-address-of-packed-member
-
-export CC AS AR LD OBJCOPY OBJDUMP STRIP READELF
-export TOOLCHAIN_CFLAGS TOOLCHAIN_LDFLAGS TOOLCHAIN_ASFLAGS
diff --git a/mk/toolchain/icc/rte.toolchain-compat.mk b/mk/toolchain/icc/rte.toolchain-compat.mk
deleted file mode 100644
index 2d663b34ad..0000000000
--- a/mk/toolchain/icc/rte.toolchain-compat.mk
+++ /dev/null
@@ -1,58 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-#
-# CPUID-related options
-#
-# This was added to support compiler versions which might not support all the
-# flags we need
-#
-
-# find out ICC version
-
-ICC_MAJOR_VERSION = $(shell icc -dumpversion | cut -f1 -d.)
-
-ifeq ($(shell test $(ICC_MAJOR_VERSION) -lt 12 && echo 1), 1)
-	MACHINE_CFLAGS = -xSSE4.2
-$(warning You are not using ICC 12.x or higher. This is neither supported, nor tested.)
-
-else
-# proceed to adjust compiler flags
-
-	ICC_MINOR_VERSION = $(shell icc -dumpversion | cut -f2 -d.)
-
-# replace GCC flags with ICC flags
-	# if icc version >= 12
-	ifeq ($(shell test $(ICC_MAJOR_VERSION) -ge 12 && echo 1), 1)
-		# Atom
-		MACHINE_CFLAGS := $(patsubst -march=atom,-xSSSE3_ATOM -march=atom,$(MACHINE_CFLAGS))
-		# nehalem/westmere
-		MACHINE_CFLAGS := $(patsubst -march=corei7,-xSSE4.2 -march=corei7,$(MACHINE_CFLAGS))
-		# sandy bridge
-		MACHINE_CFLAGS := $(patsubst -march=corei7-avx,-xAVX,$(MACHINE_CFLAGS))
-		# ivy bridge
-		MACHINE_CFLAGS := $(patsubst -march=core-avx-i,-xCORE-AVX-I,$(MACHINE_CFLAGS))
-		# hsw
-		MACHINE_CFLAGS := $(patsubst -march=core-avx2,-xCORE-AVX2,$(MACHINE_CFLAGS))
-		# remove westmere flags
-		MACHINE_CFLAGS := $(filter-out -mpclmul -maes,$(MACHINE_CFLAGS))
-	endif
-	# if icc version == 12.0
-	ifeq ($(shell test $(ICC_MAJOR_VERSION) -eq 12 && test $(ICC_MINOR_VERSION) -eq 0 && echo 1), 1)
-		# Atom
-		MACHINE_CFLAGS := $(patsubst -xSSSE3_ATOM,-xSSE3_ATOM,$(MACHINE_CFLAGS))
-		# remove march options
-		MACHINE_CFLAGS := $(patsubst -march=%,-xSSE3,$(MACHINE_CFLAGS))
-	endif
-
-	# Disable thunderx PMD for icc <= 16.0
-	ifeq ($(shell test $(ICC_MAJOR_VERSION) -le 16 && echo 1), 1)
-		CONFIG_RTE_LIBRTE_THUNDERX_NICVF_PMD=d
-	endif
-
-        # Disable event/opdl  PMD for icc <= 16.0
-	ifeq ($(shell test $(ICC_MAJOR_VERSION) -le 16 && echo 1), 1)
-		CONFIG_RTE_LIBRTE_PMD_OPDL_EVENTDEV=d
-	endif
-
-endif
diff --git a/mk/toolchain/icc/rte.vars.mk b/mk/toolchain/icc/rte.vars.mk
deleted file mode 100644
index 1729f3d849..0000000000
--- a/mk/toolchain/icc/rte.vars.mk
+++ /dev/null
@@ -1,62 +0,0 @@ 
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2014 Intel Corporation
-
-#
-# toolchain:
-#
-#   - define CC, LD, AR, AS, ... (overridden by cmdline value)
-#   - define TOOLCHAIN_CFLAGS variable (overridden by cmdline value)
-#   - define TOOLCHAIN_LDFLAGS variable (overridden by cmdline value)
-#   - define TOOLCHAIN_ASFLAGS variable (overridden by cmdline value)
-#
-
-# Warning: we do not use CROSS environment variable as icc is mainly a
-# x86->x86 compiler
-
-CC        = icc
-KERNELCC  = gcc
-CPP       = cpp
-AS        = nasm
-AR        = ar
-LD        = ld
-OBJCOPY   = objcopy
-OBJDUMP   = objdump
-STRIP     = strip
-READELF   = readelf
-
-ifeq ($(KERNELRELEASE),)
-HOSTCC    = icc
-else
-HOSTCC    = gcc
-endif
-HOSTAS    = as
-
-TOOLCHAIN_CFLAGS =
-TOOLCHAIN_LDFLAGS =
-TOOLCHAIN_ASFLAGS =
-
-# Turn off some ICC warnings -
-#   Remark #271   : trailing comma is nonstandard
-#   Warning #1478 : function "<func_name>" (declared at line N of "<filename>")
-#   error #13368: loop was not vectorized with "vector always assert"
-#   error #15527: loop was not vectorized: function call to fprintf cannot be vectorize
-#                   was declared "deprecated"
-#   Warning #11074, 11076: to prevent "inline-max-size" warnings.
-WERROR_FLAGS := -Wall -w2 -diag-disable 271 -diag-warning 1478
-WERROR_FLAGS += -diag-disable 13368 -diag-disable 15527
-WERROR_FLAGS += -diag-disable 188
-WERROR_FLAGS += -diag-disable 11074 -diag-disable 11076 -Wdeprecated
-
-# process cpu flags
-include $(RTE_SDK)/mk/toolchain/$(RTE_TOOLCHAIN)/rte.toolchain-compat.mk
-
-ifeq ($(CONFIG_RTE_ENABLE_LTO),y)
-# 'fat-lto' is used since pmdinfogen needs to have 'this_pmd_nameX'
-# exported in symbol table and without this option only internal
-# representation is present.
-TOOLCHAIN_CFLAGS += -flto -ffat-lto-objects
-TOOLCHAIN_LDFLAGS += -flto
-endif
-
-export CC AS AR LD OBJCOPY OBJDUMP STRIP READELF
-export TOOLCHAIN_CFLAGS TOOLCHAIN_LDFLAGS TOOLCHAIN_ASFLAGS