diff --git a/components/app_trace/component.mk b/components/app_trace/component.mk
deleted file mode 100644
index f69d3b5a56..0000000000
--- a/components/app_trace/component.mk
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# Component Makefile
-#
-
-COMPONENT_SRCDIRS := .
-
-ifdef CONFIG_APPTRACE_MEMBUFS_APPTRACE_PROTO_ENABLE
-COMPONENT_SRCDIRS += port/xtensa
-endif
-
-COMPONENT_ADD_INCLUDEDIRS = include
-
-COMPONENT_PRIV_INCLUDEDIRS = private_include \
-	port/include
-
-COMPONENT_ADD_LDFLAGS = -lapp_trace
-
-# do not produce gcov info for this module, it is used as transport for gcov
-CFLAGS := $(subst --coverage,,$(CFLAGS))
-
-ifdef CONFIG_APPTRACE_SV_ENABLE
-
-COMPONENT_ADD_INCLUDEDIRS += \
-	sys_view/Config \
-	sys_view/SEGGER \
-	sys_view/Sample/OS
-
-COMPONENT_SRCDIRS += \
-	gcov \
-	sys_view/SEGGER \
-	sys_view/Sample/OS \
-	sys_view/Sample/Config \
-	sys_view/esp \
-	sys_view/ext
-else
-COMPONENT_SRCDIRS += gcov
-endif
-
-COMPONENT_ADD_LDFRAGMENTS += linker.lf
diff --git a/components/app_trace/test/component.mk b/components/app_trace/test/component.mk
deleted file mode 100644
index 5dd172bdb7..0000000000
--- a/components/app_trace/test/component.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-#Component Makefile
-#
-
-COMPONENT_ADD_LDFLAGS = -Wl,--whole-archive -l$(COMPONENT_NAME) -Wl,--no-whole-archive
diff --git a/components/app_update/Makefile.projbuild b/components/app_update/Makefile.projbuild
deleted file mode 100644
index f6387635fa..0000000000
--- a/components/app_update/Makefile.projbuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Generate partition binary
-#
-.PHONY: blank_ota_data erase_otadata read_otadata
-
-OTATOOL_PY := $(PYTHON) $(COMPONENT_PATH)/otatool.py
-PARTTOOL_PY := $(PYTHON) $(IDF_PATH)/components/partition_table/parttool.py
-
-# Generate blank partition file
-BLANK_OTA_DATA_FILE = $(BUILD_DIR_BASE)/ota_data_initial.bin
-
-# Copy PARTITION_TABLE_CSV_PATH definition here from $IDF_PATH/components/partition_table/Makefile.projbuild
-# to avoid undefined variables warning for PARTITION_TABLE_CSV_PATH
-ifndef PARTITION_TABLE_CSV_PATH
-PARTITION_TABLE_ROOT := $(call dequote,$(if $(CONFIG_PARTITION_TABLE_CUSTOM),$(PROJECT_PATH),$(IDF_PATH)/components/partition_table))
-PARTITION_TABLE_CSV_PATH := $(call dequote,$(abspath $(PARTITION_TABLE_ROOT)/$(call dequote,$(CONFIG_PARTITION_TABLE_FILENAME))))
-endif
-
-$(BLANK_OTA_DATA_FILE): partition_table_get_info $(PARTITION_TABLE_CSV_PATH) | check_python_dependencies
-	$(shell if [ "$(OTA_DATA_OFFSET)" != "" ] && [ "$(OTA_DATA_SIZE)" != "" ]; then \
-				$(PYTHON) $(IDF_PATH)/components/partition_table/gen_empty_partition.py $(OTA_DATA_SIZE) $(BLANK_OTA_DATA_FILE); \
-			fi; )
-	$(eval BLANK_OTA_DATA_FILE = $(shell if [ "$(OTA_DATA_OFFSET)" != "" ] && [ "$(OTA_DATA_SIZE)" != "" ]; then \
-			echo $(BLANK_OTA_DATA_FILE); else echo " "; fi) )
-
-blank_ota_data: $(BLANK_OTA_DATA_FILE)
-
-# If there is no otadata partition, both OTA_DATA_OFFSET and BLANK_OTA_DATA_FILE
-# expand to empty values.
-ESPTOOL_ALL_FLASH_ARGS += $(OTA_DATA_OFFSET) $(BLANK_OTA_DATA_FILE)
-
-ESPTOOL_ARGS := --esptool-args port=$(CONFIG_ESPTOOLPY_PORT) baud=$(CONFIG_ESPTOOLPY_BAUD) before=$(CONFIG_ESPTOOLPY_BEFORE) after=$(CONFIG_ESPTOOLPY_AFTER)
-
-erase_otadata: $(PARTITION_TABLE_CSV_PATH) partition_table_get_info | check_python_dependencies
-	$(OTATOOL_PY) $(ESPTOOL_ARGS) --partition-table-file $(PARTITION_TABLE_CSV_PATH) \
-	--partition-table-offset $(PARTITION_TABLE_OFFSET) \
-	erase_otadata
-
-read_otadata: $(PARTITION_TABLE_CSV_PATH) partition_table_get_info | check_python_dependencies
-	$(OTATOOL_PY) $(ESPTOOL_ARGS) --partition-table-file $(PARTITION_TABLE_CSV_PATH) \
-	--partition-table-offset $(partition_table_offset) \
-	read_otadata
-
-all: blank_ota_data
-flash: blank_ota_data
-ifdef CONFIG_SECURE_FLASH_ENCRYPTION_MODE_DEVELOPMENT
-encrypted-flash: blank_ota_data
-endif
-
-TMP_DEFINES := $(BUILD_DIR_BASE)/app_update/tmp_cppflags.txt
-export TMP_DEFINES
-
-clean:
-	rm -f $(BLANK_OTA_DATA_FILE)
-	rm -f $(TMP_DEFINES)
diff --git a/components/app_update/component.mk b/components/app_update/component.mk
deleted file mode 100644
index b100d97903..0000000000
--- a/components/app_update/component.mk
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-# Component Makefile
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
-
-# esp_app_desc structure is added as an undefined symbol because otherwise the
-# linker will ignore this structure as it has no other files depending on it.
-COMPONENT_ADD_LDFLAGS += -u esp_app_desc
-
-ifndef IS_BOOTLOADER_BUILD
-    # If ``CONFIG_APP_PROJECT_VER_FROM_CONFIG`` option is set, the value of ``CONFIG_APP_PROJECT_VER`` will be used
-    # Else, if ``PROJECT_VER`` variable set in project Makefile file, its value will be used.
-    # Else, if the ``$PROJECT_PATH/version.txt`` exists, its contents will be used as ``PROJECT_VER``.
-    # Else, if the project is located inside a Git repository, the output of git describe will be used.
-    # Otherwise, ``PROJECT_VER`` will be "1".
-    ifdef CONFIG_APP_PROJECT_VER_FROM_CONFIG
-        PROJECT_VER:= $(CONFIG_APP_PROJECT_VER)
-    else
-        ifneq ("${PROJECT_VER}", "")
-            PROJECT_VER:= $(PROJECT_VER)
-        else
-            ifneq ("$(wildcard ${PROJECT_PATH}/version.txt)","")
-                PROJECT_VER := $(shell cat ${PROJECT_PATH}/version.txt)
-            else
-                GIT_PROJECT_VER := $(shell cd ${PROJECT_PATH} && git describe --always --tags --dirty 2> /dev/null)
-                ifeq ("${GIT_PROJECT_VER}", "")
-                    PROJECT_VER := "1"
-                    $(info Project is not inside a git repository, or git repository has no commits)
-                    $(info will not use 'git describe' to determine PROJECT_VER.)
-                else
-                    PROJECT_VER:= $(GIT_PROJECT_VER)
-                endif # a git repository
-            endif # version.txt
-        endif # PROJECT_VER
-    endif # CONFIG_APP_PROJECT_VER_FROM_CONFIG
-
-    # cut PROJECT_VER and PROJECT_NAME to required 32 characters.
-    PROJECT_VER_CUT  := $(shell echo "$(PROJECT_VER)"  | cut -c 1-31)
-    PROJECT_NAME_CUT := $(shell echo "$(PROJECT_NAME)" | cut -c 1-31)
-
-    $(info App "$(PROJECT_NAME_CUT)" version: $(PROJECT_VER_CUT))
-
-    NEW_DEFINES:= "$(PROJECT_VER_CUT) $(PROJECT_NAME_CUT) $(IDF_VER)"
-    ifeq ("$(wildcard ${TMP_DEFINES})","")
-        OLD_DEFINES:= ""
-    else
-        OLD_DEFINES:= "$(shell cat $(TMP_DEFINES))"
-    endif
-
-    # If NEW_DEFINES (PROJECT_VER, PROJECT_NAME) were changed then rebuild only esp_app_desc.
-    ifneq (${NEW_DEFINES}, ${OLD_DEFINES})
-        $(shell echo $(NEW_DEFINES) > $(TMP_DEFINES); rm -f esp_app_desc.o;)
-    endif
-
-    esp_app_desc.o: CPPFLAGS += -D PROJECT_VER=\""$(PROJECT_VER_CUT)"\" -D PROJECT_NAME=\""$(PROJECT_NAME_CUT)"\"
-endif # IS_BOOTLOADER_BUILD
diff --git a/components/app_update/test/component.mk b/components/app_update/test/component.mk
deleted file mode 100644
index 5dd172bdb7..0000000000
--- a/components/app_update/test/component.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-#Component Makefile
-#
-
-COMPONENT_ADD_LDFLAGS = -Wl,--whole-archive -l$(COMPONENT_NAME) -Wl,--no-whole-archive
diff --git a/components/asio/component.mk b/components/asio/component.mk
deleted file mode 100644
index c93c8dbb97..0000000000
--- a/components/asio/component.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-ifdef CONFIG_LWIP_IPV6
-
-COMPONENT_ADD_INCLUDEDIRS := asio/asio/include port/include
-COMPONENT_PRIV_INCLUDEDIRS := private_include
-COMPONENT_SRCDIRS := asio/asio/src port/src
-
-ifeq ($(CONFIG_ASIO_SSL_SUPPORT), )
-COMPONENT_OBJEXCLUDE := asio/asio/src/asio_ssl.o port/src/esp_asio_openssl_stubs.o
-endif
-
-COMPONENT_SUBMODULES += asio
-
-endif # CONFIG_LWIP_IPV6
diff --git a/components/bootloader/Makefile.projbuild b/components/bootloader/Makefile.projbuild
deleted file mode 100644
index 565d197fd8..0000000000
--- a/components/bootloader/Makefile.projbuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Bootloader component (top-level project parts)
-#
-# The bootloader is not a real component that gets linked into the project.
-# Instead it is an entire standalone project (in subproject/) that gets
-# built in the upper project's build directory. This Makefile.projbuild provides
-# the glue to build the bootloader project from the original project. It
-# basically runs Make in the subproject/ directory but it needs to
-# zero some variables the ESP-IDF project.mk makefile exports first, to not
-# let them interfere.
-#
-BOOTLOADER_COMPONENT_PATH := $(COMPONENT_PATH)
-BOOTLOADER_BUILD_DIR=$(abspath $(BUILD_DIR_BASE)/bootloader)
-BOOTLOADER_BIN=$(BOOTLOADER_BUILD_DIR)/bootloader.bin
-
-# signing key path is resolved relative to the project directory
-CONFIG_SECURE_BOOT_SIGNING_KEY ?=
-SECURE_BOOT_SIGNING_KEY=$(abspath $(call dequote,$(CONFIG_SECURE_BOOT_SIGNING_KEY)))
-export SECURE_BOOT_SIGNING_KEY  # used by bootloader_support component
-
-BOOTLOADER_SIGNED_BIN ?=
-
-# Has a matching value in bootloader_support esp_flash_partitions.h
-BOOTLOADER_OFFSET := 0x1000
-
-# Custom recursive make for bootloader sub-project
-#
-# NB: Some variables are cleared in the environment, not
-# overriden, because they need to be re-defined in the child
-# project.
-#
-# Pass PROJECT_PATH variable, it will let the subproject look
-# for user defined bootloader component(s).
-BOOTLOADER_MAKE= +\
-	PROJECT_PATH= \
-	COMPONENT_DIRS= \
-	$(MAKE) -C $(BOOTLOADER_COMPONENT_PATH)/subproject \
-	V=$(V) \
-	BUILD_DIR_BASE=$(BOOTLOADER_BUILD_DIR) \
-	TEST_COMPONENTS= \
-	TESTS_ALL= \
-	EXCLUDE_COMPONENTS= \
-	PROJECT_SOURCE_DIR=$(PROJECT_PATH)
-
-.PHONY: bootloader-clean bootloader-flash bootloader-list-components bootloader $(BOOTLOADER_BIN)
-
-$(BOOTLOADER_BIN): $(SDKCONFIG_MAKEFILE)
-	$(BOOTLOADER_MAKE) $@
-
-clean: bootloader-clean
-
-bootloader-list-components:
-	$(BOOTLOADER_MAKE) list-components
-
-ifndef CONFIG_SECURE_BOOT
-# If secure boot disabled, bootloader flashing is integrated
-# with 'make flash' and no warnings are printed.
-
-bootloader: $(BOOTLOADER_BIN) | check_python_dependencies
-	@echo $(SEPARATOR)
-	@echo "Bootloader built. Default flash command is:"
-	@echo "$(ESPTOOLPY_WRITE_FLASH) $(BOOTLOADER_OFFSET) $^"
-
-ESPTOOL_ALL_FLASH_ARGS += $(BOOTLOADER_OFFSET) $(BOOTLOADER_BIN)
-UF2_ADD_BINARIES += $(BOOTLOADER_OFFSET) $(BOOTLOADER_BIN)
-
-bootloader-flash: $(BOOTLOADER_BIN) $(call prereq_if_explicit,erase_flash) | check_python_dependencies
-	$(ESPTOOLPY_WRITE_FLASH) 0x1000 $^
-
-else ifdef CONFIG_SECURE_BOOTLOADER_ONE_TIME_FLASH
-
-# One time flashing requires user to run esptool.py command themselves,
-# and warning is printed about inability to reflash.
-#
-# The flashing command is deliberately printed without an auto-reset
-# step, so the device doesn't immediately reset to flash itself.
-
-bootloader: $(BOOTLOADER_BIN) | check_python_dependencies
-	@echo $(SEPARATOR)
-	@echo "Bootloader built. One-time flash command is:"
-	@echo "$(subst hard_reset,no_reset,$(ESPTOOLPY_WRITE_FLASH)) $(BOOTLOADER_OFFSET) $(BOOTLOADER_BIN)"
-	@echo $(SEPARATOR)
-	@echo "* IMPORTANT: After first boot, BOOTLOADER CANNOT BE RE-FLASHED on same device"
-
-else ifdef CONFIG_SECURE_BOOTLOADER_REFLASHABLE
-# Reflashable secure bootloader
-# generates a digest binary (bootloader + digest)
-
-ifdef CONFIG_SECURE_BOOTLOADER_KEY_ENCODING_192BIT
-KEY_DIGEST_LEN=192
-else
-KEY_DIGEST_LEN=256
-endif
-
-BOOTLOADER_DIGEST_BIN := $(BOOTLOADER_BUILD_DIR)/bootloader-reflash-digest.bin
-SECURE_BOOTLOADER_KEY := $(BOOTLOADER_BUILD_DIR)/secure-bootloader-key-$(KEY_DIGEST_LEN).bin
-
-ifdef CONFIG_SECURE_BOOT_BUILD_SIGNED_BINARIES
-$(SECURE_BOOTLOADER_KEY): $(SECURE_BOOT_SIGNING_KEY) | check_python_dependencies
-	$(ESPSECUREPY) digest_private_key --keylen $(KEY_DIGEST_LEN) -k $< $@
-else
-$(SECURE_BOOTLOADER_KEY):
-	@echo "No pre-generated key for a reflashable secure bootloader is available, due to signing configuration."
-	@echo "To generate one, you can use this command:"
-	@echo "espsecure.py generate_flash_encryption_key $@"
-	@echo "then re-run make."
-	exit 1
-endif
-
-bootloader: $(BOOTLOADER_DIGEST_BIN)
-	@echo $(SEPARATOR)
-	@echo "Bootloader built and secure digest generated. First time flash command is:"
-	@echo "$(ESPEFUSEPY) burn_key secure_boot_v1 $(SECURE_BOOTLOADER_KEY)"
-	@echo "$(ESPTOOLPY_WRITE_FLASH) $(BOOTLOADER_OFFSET) $(BOOTLOADER_BIN)"
-	@echo $(SEPARATOR)
-	@echo "To reflash the bootloader after initial flash:"
-	@echo "$(ESPTOOLPY_WRITE_FLASH) 0x0 $(BOOTLOADER_DIGEST_BIN)"
-	@echo $(SEPARATOR)
-	@echo "* After first boot, only re-flashes of this kind (with same key) will be accepted."
-	@echo "* Not recommended to re-use the same secure boot keyfile on multiple production devices."
-
-$(BOOTLOADER_DIGEST_BIN): $(BOOTLOADER_BIN) $(SECURE_BOOTLOADER_KEY) | check_python_dependencies
-	@echo "DIGEST $(notdir $@)"
-	$(ESPSECUREPY) digest_secure_bootloader -k $(SECURE_BOOTLOADER_KEY) -o $@ $<
-
-else ifdef CONFIG_SECURE_BOOT_V2_ENABLED
-BOOTLOADER_SIGNED_BIN := $(BOOTLOADER_BUILD_DIR)/bootloader-signed.bin
-ifdef CONFIG_SECURE_BOOT_BUILD_SIGNED_BINARIES
-bootloader: $(BOOTLOADER_BIN) $(SDKCONFIG_MAKEFILE) | check_python_dependencies
-	$(ESPSECUREPY) sign_data --keyfile $(SECURE_BOOT_SIGNING_KEY) --version 2 \
-	-o $(BOOTLOADER_SIGNED_BIN) $(BOOTLOADER_BIN)
-else
-bootloader: $(BOOTLOADER_BIN) $(SDKCONFIG_MAKEFILE) | check_python_dependencies
-	@echo "Bootloader not signed. Sign the bootloader before flashing."
-	@echo "To sign the bootloader, you can use this command:"
-	@echo "espsecure.py sign_data --keyfile SECURE_BOOT_SIGNING_KEY --version 2 $(BOOTLOADER_BIN)"
-endif
-	@echo $(SEPARATOR)
-	@echo "Use the following command to flash the bootloader:"
-ifdef CONFIG_SECURE_BOOT_BUILD_SIGNED_BINARIES
-	@echo "$(ESPTOOLPY_WRITE_FLASH) $(BOOTLOADER_OFFSET) $(BOOTLOADER_SIGNED_BIN)"
-else
-	@echo "$(ESPTOOLPY_WRITE_FLASH) $(BOOTLOADER_OFFSET) $(BOOTLOADER_BIN)"
-endif
-	@echo $(SEPARATOR)
-
-else # CONFIG_SECURE_BOOT && !CONFIG_SECURE_BOOTLOADER_REFLASHABLE \
-&& !CONFIG_SECURE_BOOTLOADER_ONE_TIME_FLASH && !CONFIG_SECURE_SIGNED_APPS_RSA_SCHEME
-bootloader:
-	@echo "Invalid bootloader target: bad sdkconfig?"
-	@exit 1
-endif
-
-ifndef CONFIG_SECURE_BOOT
-# don't build bootloader by default if secure boot is enabled
-all_binaries: $(BOOTLOADER_BIN)
-endif
-
-bootloader-clean: $(SDKCONFIG_MAKEFILE)
-	$(BOOTLOADER_MAKE) app-clean
-ifdef CONFIG_SECURE_BOOTLOADER_REFLASHABLE
-	rm -f $(SECURE_BOOTLOADER_KEY) $(BOOTLOADER_DIGEST_BIN)
-endif
-ifdef CONFIG_SECURE_SIGNED_APPS_RSA_SCHEME
-ifdef CONFIG_SECURE_BOOT_BUILD_SIGNED_BINARIES
-	rm -f $(BOOTLOADER_SIGNED_BIN)
-endif
-endif
diff --git a/components/bootloader/component.mk b/components/bootloader/component.mk
deleted file mode 100644
index 0ec5d93c38..0000000000
--- a/components/bootloader/component.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-# bootloader component is special, as bootloader is also a project.
-#
-# This top-level component is only configuration files for the IDF project.
-#
-# See Makefile.projbuild for the targets which actually build the bootloader.
-COMPONENT_CONFIG_ONLY := 1
diff --git a/components/bootloader/subproject/Makefile b/components/bootloader/subproject/Makefile
deleted file mode 100644
index 5db762b78f..0000000000
--- a/components/bootloader/subproject/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-ifeq ("$(MAKELEVEL)","0")
-$(error Bootloader makefile expects to be run as part of 'make bootloader' from a top-level project.)
-endif
-
-PROJECT_NAME := bootloader
-
-COMPONENTS := esp_hw_support esptool_py bootloader_support log spi_flash micro-ecc soc main efuse esp_rom hal xtensa
-
-# Clear C and CXX from top level project
-CFLAGS =
-CXXFLAGS =
-
-#We cannot include the some components like idf_target, esp_common directly but we need their includes.
-CFLAGS += -I $(IDF_PATH)/components/$(IDF_TARGET)/include
-CFLAGS += -I $(IDF_PATH)/components/esp_common/include
-CFLAGS += -I $(IDF_PATH)/components/newlib/platform_include
-CFLAGS += -I $(IDF_PATH)/components/xtensa/include -I $(IDF_PATH)/components/xtensa/$(IDF_TARGET)/include
-
-# The bootloader pseudo-component is also included in this build, for its Kconfig.projbuild to be included.
-#
-# IS_BOOTLOADER_BUILD tells the component Makefile.projbuild to be a no-op
-IS_BOOTLOADER_BUILD := 1
-export IS_BOOTLOADER_BUILD
-
-# BOOTLOADER_BUILD macro is the same, for source file changes
-CFLAGS += -D BOOTLOADER_BUILD=1
-
-# include the top-level "project" include directory, for sdkconfig.h
-CFLAGS += -I$(BUILD_DIR_BASE)/../include
-
-include $(IDF_PATH)/make/project.mk
diff --git a/components/bootloader/subproject/components/micro-ecc/component.mk b/components/bootloader/subproject/components/micro-ecc/component.mk
deleted file mode 100644
index 0ce055be0a..0000000000
--- a/components/bootloader/subproject/components/micro-ecc/component.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-# only compile the "uECC_verify_antifault.c" file which includes the "micro-ecc/uECC.c" source file
-COMPONENT_SRCDIRS := .
-
-COMPONENT_ADD_INCLUDEDIRS := . micro-ecc
-
-COMPONENT_SUBMODULES := micro-ecc
diff --git a/components/bootloader/subproject/main/component.mk b/components/bootloader/subproject/main/component.mk
deleted file mode 100644
index c41e8b7095..0000000000
--- a/components/bootloader/subproject/main/component.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# Main bootloader Makefile.
-#
-# This is basically the same as a component makefile, but in the case of the bootloader
-# we pull in bootloader-specific linker arguments.
-#
-
-LINKER_SCRIPTS := \
-    $(COMPONENT_PATH)/ld/$(IDF_TARGET)/bootloader.ld \
-    $(COMPONENT_PATH)/ld/$(IDF_TARGET)/bootloader.rom.ld \
-    $(IDF_PATH)/components/esp_rom/$(IDF_TARGET)/ld/$(IDF_TARGET).rom.ld \
-    $(IDF_PATH)/components/esp_rom/$(IDF_TARGET)/ld/$(IDF_TARGET).rom.newlib-funcs.ld \
-    $(IDF_PATH)/components/esp_rom/$(IDF_TARGET)/ld/$(IDF_TARGET).rom.api.ld
-
-# SPI driver patch for ROM is only needed in ESP32
-ifdef CONFIG_IDF_TARGET_ESP32
-    ifndef CONFIG_SPI_FLASH_ROM_DRIVER_PATCH
-        LINKER_SCRIPTS += $(IDF_PATH)/components/esp_rom/$(IDF_TARGET)/ld/$(IDF_TARGET).rom.spiflash.ld
-    endif
-    ifdef CONFIG_ESP32_REV_MIN_3
-        LINKER_SCRIPTS += $(IDF_PATH)/components/esp_rom/$(IDF_TARGET)/ld/$(IDF_TARGET).rom.eco3.ld
-    endif
-endif
-
-COMPONENT_ADD_LDFLAGS += -L $(COMPONENT_PATH) $(addprefix -T ,$(LINKER_SCRIPTS))
-
-COMPONENT_ADD_LINKER_DEPS := $(LINKER_SCRIPTS)
diff --git a/components/bootloader_support/Makefile.projbuild b/components/bootloader_support/Makefile.projbuild
deleted file mode 100644
index ee62930c60..0000000000
--- a/components/bootloader_support/Makefile.projbuild
+++ /dev/null
@@ -1,7 +0,0 @@
-$(SECURE_BOOT_SIGNING_KEY):
-	@echo "Need to generate secure boot signing key."
-	@echo "One way is to run this command:"
-	@echo "$(ESPSECUREPY) generate_signing_key $@"
-	@echo "Keep key file safe after generating."
-	@echo "(See secure boot documentation for risks & alternatives.)"
-	@exit 1
diff --git a/components/bootloader_support/component.mk b/components/bootloader_support/component.mk
deleted file mode 100644
index cd4f992cb0..0000000000
--- a/components/bootloader_support/component.mk
+++ /dev/null
@@ -1,124 +0,0 @@
-COMPONENT_ADD_INCLUDEDIRS := include
-
-ifdef IS_BOOTLOADER_BUILD
-# share "include_bootloader" headers with bootloader main component
-COMPONENT_ADD_INCLUDEDIRS += include_bootloader
-else
-COMPONENT_PRIV_INCLUDEDIRS := include_bootloader
-endif
-
-COMPONENT_SRCDIRS := src \
-			src/secure_boot_v2 \
-			src/secure_boot_v1
-
-ifndef IS_BOOTLOADER_BUILD
-COMPONENT_SRCDIRS += src/idf  # idf sub-directory contains platform agnostic IDF versions
-else
-COMPONENT_SRCDIRS += src/$(IDF_TARGET)  # one sub-dir per chip
-ifdef CONFIG_SECURE_FLASH_ENC_ENABLED
-COMPONENT_SRCDIRS += src/flash_encryption
-endif
-endif
-
-ifndef IS_BOOTLOADER_BUILD
-COMPONENT_OBJEXCLUDE := src/bootloader_init.o \
-			src/bootloader_panic.o \
-			src/bootloader_clock_loader.o \
-			src/bootloader_console.o \
-			src/bootloader_console_loader.o
-endif
-
-COMPONENT_OBJEXCLUDE += src/bootloader_flash_config_esp32s2.o \
-			src/bootloader_flash_config_esp32s3.o \
-			src/bootloader_flash_config_esp32c3.o \
-			src/bootloader_flash_config_esp32h2.o \
-			src/bootloader_flash_config_esp8684.o \
-			src/bootloader_efuse_esp32s2.o \
-			src/bootloader_efuse_esp32s3.o \
-			src/bootloader_efuse_esp32c3.o \
-			src/bootloader_efuse_esp32h2.o \
-			src/bootloader_efuse_esp8684.o \
-			src/bootloader_random_esp32s2.o \
-			src/bootloader_random_esp32s3.o \
-			src/bootloader_random_esp32c3.o \
-			src/bootloader_random_esp32h2.o \
-			src/bootloader_random_esp8684.o
-
-ifdef IS_BOOTLOADER_BUILD
-	ifndef CONFIG_SECURE_SIGNED_APPS_ECDSA_SCHEME
-		COMPONENT_OBJEXCLUDE += src/secure_boot_v1/secure_boot_signatures_bootloader.o
-	endif
-
-	ifndef CONFIG_SECURE_SIGNED_APPS_RSA_SCHEME
-		COMPONENT_OBJEXCLUDE += src/secure_boot_v2/secure_boot_signatures_bootloader.o
-	endif
-
-	ifndef CONFIG_SECURE_BOOT_V1_ENABLED
-		COMPONENT_OBJEXCLUDE += src/secure_boot_v1/secure_boot.o
-	endif
-
-	ifndef CONFIG_SECURE_BOOT_V2_ENABLED
-		COMPONENT_OBJEXCLUDE += src/secure_boot_v2/secure_boot.o
-	endif
-
-	ifndef CONFIG_SECURE_BOOT
-		COMPONENT_OBJEXCLUDE += src/${IDF_TARGET}/secure_boot_secure_features.o
-	endif
-
-	ifndef CONFIG_SECURE_FLASH_ENC_ENABLED
-		COMPONENT_OBJEXCLUDE += src/${IDF_TARGET}/flash_encryption_secure_features.o
-	endif
-
-	COMPONENT_OBJEXCLUDE += src/secure_boot_v1/secure_boot_signatures_app.o \
-				src/secure_boot_v2/secure_boot_signatures_app.o
-else
-	ifndef CONFIG_SECURE_SIGNED_APPS_ECDSA_SCHEME
-		COMPONENT_OBJEXCLUDE += src/secure_boot_v1/secure_boot_signatures_app.o
-	endif
-
-	ifndef CONFIG_SECURE_SIGNED_APPS_RSA_SCHEME
-		COMPONENT_OBJEXCLUDE += src/secure_boot_v2/secure_boot_signatures_app.o
-	endif
-
-	COMPONENT_OBJEXCLUDE += src/secure_boot_v1/secure_boot_signatures_bootloader.o \
-				src/secure_boot_v1/secure_boot.o \
-				src/secure_boot_v2/secure_boot_signatures_bootloader.o \
-				src/secure_boot_v2/secure_boot.o
-endif # IS_BOOTLOADER_BUILD
-
-#
-# Secure boot signing key support
-#
-ifdef CONFIG_SECURE_SIGNED_APPS
-
-ifdef CONFIG_SECURE_SIGNED_APPS_ECDSA_SCHEME
-# this path is created relative to the component build directory
-SECURE_BOOT_VERIFICATION_KEY := $(abspath signature_verification_key.bin)
-
-ifdef CONFIG_SECURE_BOOT_BUILD_SIGNED_BINARIES
-# verification key derived from signing key.
-$(SECURE_BOOT_VERIFICATION_KEY): $(SECURE_BOOT_SIGNING_KEY) $(SDKCONFIG_MAKEFILE)
-	$(ESPSECUREPY) extract_public_key --keyfile $< $@
-else
-# find the configured public key file
-ORIG_SECURE_BOOT_VERIFICATION_KEY := $(call resolvepath,$(call dequote,$(CONFIG_SECURE_BOOT_VERIFICATION_KEY)),$(PROJECT_PATH))
-
-$(ORIG_SECURE_BOOT_VERIFICATION_KEY):
-	@echo "Secure boot verification public key '$@' missing."
-	@echo "This can be extracted from the private signing key, see"
-	@echo "docs/security/secure-boot-v1.rst for details."
-	exit 1
-
-# copy it into the build dir, so the secure boot verification key has
-# a predictable file name
-$(SECURE_BOOT_VERIFICATION_KEY): $(ORIG_SECURE_BOOT_VERIFICATION_KEY) $(SDKCONFIG_MAKEFILE)
-	$(summary) CP $< $@
-	cp $< $@
-endif #CONFIG_SECURE_BOOT_BUILD_SIGNED_BINARIES
-
-COMPONENT_EXTRA_CLEAN += $(SECURE_BOOT_VERIFICATION_KEY)
-
-COMPONENT_EMBED_FILES := $(SECURE_BOOT_VERIFICATION_KEY)
-
-endif #CONFIG_SECURE_SIGNED_APPS_ECDSA_SCHEME
-endif #CONFIG_SECURE_SIGNED_APPS
diff --git a/components/bootloader_support/test/component.mk b/components/bootloader_support/test/component.mk
deleted file mode 100644
index 8c6eb513e4..0000000000
--- a/components/bootloader_support/test/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-#Component Makefile
-#
-COMPONENT_ADD_LDFLAGS = -Wl,--whole-archive -l$(COMPONENT_NAME) -Wl,--no-whole-archive
diff --git a/components/bt/component.mk b/components/bt/component.mk
deleted file mode 100644
index bd8d52371a..0000000000
--- a/components/bt/component.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-#
-# Component Makefile
-#
-ifdef CONFIG_BT_ENABLED
-
-COMPONENT_SRCDIRS := controller
-
-COMPONENT_ADD_INCLUDEDIRS := include
-
-LIBS := btdm_app
-
-COMPONENT_ADD_LDFLAGS     := -lbt -L $(COMPONENT_PATH)/controller/lib_esp32/esp32 \
-                          -u ld_include_hli_vectors_bt \
-                           $(addprefix -l,$(LIBS))
-
-# re-link program if BT binary libs change
-COMPONENT_ADD_LINKER_DEPS := $(patsubst %,$(COMPONENT_PATH)/controller/lib_esp32/esp32/lib%.a,$(LIBS))
-
-COMPONENT_SUBMODULES += controller/lib_esp32
-COMPONENT_ADD_LDFRAGMENTS += linker.lf
-
-
-# TODO: annotate fallthroughs in Bluedroid code with comments
-CFLAGS += -Wno-implicit-fallthrough
-
-COMPONENT_ADD_INCLUDEDIRS +=    include/esp32/include
-COMPONENT_SRCDIRS +=  controller/esp32
-
-COMPONENT_PRIV_INCLUDEDIRS += common/btc/include              	   \
-							  common/include
-
-COMPONENT_ADD_INCLUDEDIRS +=  common/api/include/api                       \
-                              common/btc/profile/esp/blufi/include         \
-                              common/btc/profile/esp/include               \
-		              common/osi/include
-COMPONENT_SRCDIRS +=    common/api        \
-	                common/btc/core                               \
-                        common/osi              \
-                        common/btc/profile/esp/blufi
-
-ifdef CONFIG_BT_BLUEDROID_ENABLED
-
-COMPONENT_PRIV_INCLUDEDIRS +=   host/bluedroid/bta/include                   \
-                                host/bluedroid/bta/ar/include                \
-                                host/bluedroid/bta/av/include                \
-                                host/bluedroid/bta/hf_ag/include             \
-                                host/bluedroid/bta/hf_client/include         \
-                                host/bluedroid/bta/dm/include                \
-                                host/bluedroid/bta/gatt/include              \
-                                host/bluedroid/bta/hd/include                \
-                                host/bluedroid/bta/hh/include                \
-                                host/bluedroid/bta/jv/include                \
-                                host/bluedroid/bta/sdp/include               \
-                                host/bluedroid/bta/sys/include               \
-                                host/bluedroid/device/include                \
-                                host/bluedroid/gki/include                   \
-                                host/bluedroid/hci/include                   \
-                                host/bluedroid/utils/include                 \
-                                host/bluedroid/external/sbc/decoder/include  \
-                                host/bluedroid/external/sbc/encoder/include  \
-                                host/bluedroid/external/sbc/plc/include      \
-                                host/bluedroid/btc/profile/esp/include       \
-                                host/bluedroid/btc/profile/std/gatt/include  \
-                                host/bluedroid/btc/profile/std/gap/include   \
-                                host/bluedroid/btc/profile/std/a2dp/include  \
-                                host/bluedroid/btc/profile/std/hid/include   \
-                                host/bluedroid/btc/profile/std/include       \
-                                host/bluedroid/btc/include                   \
-                                host/bluedroid/btif/include                  \
-                                host/bluedroid/stack/btm/include             \
-                                host/bluedroid/stack/btu/include             \
-                                host/bluedroid/stack/gap/include             \
-                                host/bluedroid/stack/gatt/include            \
-                                host/bluedroid/stack/hcic/include            \
-                                host/bluedroid/stack/hid/include             \
-                                host/bluedroid/stack/l2cap/include           \
-                                host/bluedroid/stack/sdp/include             \
-                                host/bluedroid/stack/smp/include             \
-                                host/bluedroid/stack/avct/include            \
-                                host/bluedroid/stack/avrc/include            \
-                                host/bluedroid/stack/avdt/include            \
-                                host/bluedroid/stack/a2dp/include            \
-                                host/bluedroid/stack/rfcomm/include          \
-                                host/bluedroid/stack/include                 \
-                                host/bluedroid/utils/include                 \
-                                host/bluedroid/common/include                \
-
-COMPONENT_ADD_INCLUDEDIRS +=    host/bluedroid/api/include/api       \
-
-COMPONENT_SRCDIRS +=    host/bluedroid/bta/dm                      \
-                        host/bluedroid/bta/gatt                    \
-                        host/bluedroid/bta/hd                      \
-                        host/bluedroid/bta/hh                      \
-                        host/bluedroid/bta/sdp                     \
-                        host/bluedroid/bta/av                      \
-                        host/bluedroid/bta/ar                      \
-                        host/bluedroid/bta/sys                     \
-                        host/bluedroid/bta/jv                      \
-                        host/bluedroid/bta/hf_ag                   \
-                        host/bluedroid/bta/hf_client               \
-                        host/bluedroid/bta                         \
-                        host/bluedroid/btif                        \
-                        host/bluedroid/device                      \
-                        host/bluedroid/gki                         \
-                        host/bluedroid/hci                         \
-                        host/bluedroid/main                        \
-                        host/bluedroid/external/sbc/decoder/srce   \
-                        host/bluedroid/external/sbc/encoder/srce   \
-                        host/bluedroid/external/sbc/plc            \
-                        host/bluedroid/btc/core                    \
-                        host/bluedroid/btc/profile/std/gap         \
-                        host/bluedroid/btc/profile/std/gatt        \
-                        host/bluedroid/btc/profile/std/a2dp        \
-                        host/bluedroid/btc/profile/std/avrc        \
-                        host/bluedroid/btc/profile/std/spp         \
-                        host/bluedroid/btc/profile/std/hf_ag       \
-                        host/bluedroid/btc/profile/std/hf_client   \
-                        host/bluedroid/btc/profile/std/hid         \
-                        host/bluedroid/btc/profile                 \
-                        host/bluedroid/stack/btm                   \
-                        host/bluedroid/stack/btu                   \
-                        host/bluedroid/stack/gap                   \
-                        host/bluedroid/stack/gatt                  \
-                        host/bluedroid/stack/hcic                  \
-                        host/bluedroid/stack/hid                   \
-                        host/bluedroid/stack/include               \
-                        host/bluedroid/stack/l2cap                 \
-                        host/bluedroid/stack/sdp                   \
-                        host/bluedroid/stack/smp                   \
-                        host/bluedroid/stack/avct                  \
-                        host/bluedroid/stack/avrc                  \
-                        host/bluedroid/stack/avdt                  \
-                        host/bluedroid/stack/a2dp                  \
-                        host/bluedroid/stack/rfcomm                \
-                        host/bluedroid/stack                       \
-                        host/bluedroid/utils                       \
-                        host/bluedroid/api                         \
-                        host/bluedroid
-
-
-host/bluedroid/bta/sdp/bta_sdp_act.o: CFLAGS += -Wno-unused-const-variable
-host/bluedroid/btc/core/btc_config.o: CFLAGS += -Wno-unused-const-variable
-host/bluedroid/stack/btm/btm_sec.o: CFLAGS += -Wno-unused-const-variable
-host/bluedroid/stack/smp/smp_keys.o: CFLAGS += -Wno-unused-const-variable
-
-COMPONENT_SRCDIRS += common/btc/profile/esp/blufi/bluedroid_host
-
-ifdef CONFIG_BLE_MESH
-
-COMPONENT_SRCDIRS += esp_ble_mesh/mesh_core/bluedroid_host
-
-endif
-endif
-
-ifdef CONFIG_BLE_MESH
-COMPONENT_ADD_INCLUDEDIRS += esp_ble_mesh/mesh_common/include           \
-                             esp_ble_mesh/mesh_common/tinycrypt/include \
-                             esp_ble_mesh/mesh_core                     \
-                             esp_ble_mesh/mesh_core/include             \
-                             esp_ble_mesh/mesh_core/storage             \
-                             esp_ble_mesh/btc/include                   \
-                             esp_ble_mesh/mesh_models/common/include    \
-                             esp_ble_mesh/mesh_models/client/include    \
-                             esp_ble_mesh/mesh_models/server/include    \
-                             esp_ble_mesh/api/core/include              \
-                             esp_ble_mesh/api/models/include            \
-                             esp_ble_mesh/api
-
-COMPONENT_SRCDIRS += esp_ble_mesh/mesh_common               \
-                     esp_ble_mesh/mesh_common/tinycrypt/src \
-                     esp_ble_mesh/mesh_core                 \
-                     esp_ble_mesh/mesh_core/storage         \
-                     esp_ble_mesh/btc                       \
-                     esp_ble_mesh/mesh_models/common        \
-                     esp_ble_mesh/mesh_models/client        \
-                     esp_ble_mesh/mesh_models/server        \
-                     esp_ble_mesh/api/core                  \
-                     esp_ble_mesh/api/models
-endif
-
-
-ifdef CONFIG_BT_NIMBLE_ENABLED
-
-COMPONENT_ADD_INCLUDEDIRS += host/nimble/nimble/nimble/include                     \
-                             host/nimble/nimble/nimble/host/include                \
-                             host/nimble/nimble/porting/nimble/include             \
-                             host/nimble/nimble/porting/npl/freertos/include       \
-                             host/nimble/nimble/nimble/host/services/ans/include   \
-                             host/nimble/nimble/nimble/host/services/bas/include   \
-                             host/nimble/nimble/nimble/host/services/dis/include   \
-                             host/nimble/nimble/nimble/host/services/gap/include   \
-                             host/nimble/nimble/nimble/host/services/gatt/include  \
-                             host/nimble/nimble/nimble/host/services/ias/include   \
-                             host/nimble/nimble/nimble/host/services/ipss/include  \
-                             host/nimble/nimble/nimble/host/services/lls/include   \
-                             host/nimble/nimble/nimble/host/services/tps/include   \
-                             host/nimble/nimble/nimble/host/util/include           \
-                             host/nimble/nimble/nimble/host/store/ram/include      \
-                             host/nimble/nimble/nimble/host/store/config/include   \
-                             host/nimble/esp-hci/include                           \
-                             host/nimble/port/include
-
-ifndef CONFIG_BT_NIMBLE_CRYPTO_STACK_MBEDTLS
-COMPONENT_ADD_INCLUDEDIRS += host/nimble/nimble/ext/tinycrypt/include
-endif
-
-COMPONENT_SRCDIRS += host/nimble/nimble/nimble/host/src                            \
-                     host/nimble/nimble/porting/nimble/src                         \
-                     host/nimble/nimble/porting/npl/freertos/src                   \
-                     host/nimble/nimble/nimble/host/services/ans/src               \
-                     host/nimble/nimble/nimble/host/services/bas/src               \
-                     host/nimble/nimble/nimble/host/services/dis/src               \
-                     host/nimble/nimble/nimble/host/services/gap/src               \
-                     host/nimble/nimble/nimble/host/services/gatt/src              \
-                     host/nimble/nimble/nimble/host/services/ias/src               \
-                     host/nimble/nimble/nimble/host/services/ipss/src              \
-                     host/nimble/nimble/nimble/host/services/lls/src               \
-                     host/nimble/nimble/nimble/host/services/tps/src               \
-                     host/nimble/nimble/nimble/host/util/src                       \
-                     host/nimble/nimble/nimble/host/store/ram/src                  \
-                     host/nimble/nimble/nimble/host/store/config/src               \
-                     host/nimble/esp-hci/src                                       \
-                     host/nimble/port/src
-
-ifndef CONFIG_BT_NIMBLE_CRYPTO_STACK_MBEDTLS
-COMPONENT_SRCDIRS += host/nimble/nimble/ext/tinycrypt/src
-endif
-
-COMPONENT_OBJEXCLUDE += host/nimble/nimble/nimble/host/store/config/src/ble_store_config_conf.o
-
-ifdef CONFIG_BLE_MESH
-
-COMPONENT_SRCDIRS += esp_ble_mesh/mesh_core/nimble_host
-
-endif
-
-ifdef CONFIG_BT_NIMBLE_MESH
-
-COMPONENT_ADD_INCLUDEDIRS += host/nimble/nimble/nimble/host/mesh/include
-COMPONENT_SRCDIRS += host/nimble/nimble/nimble/host/mesh/src
-
-endif
-COMPONENT_SRCDIRS += common/btc/profile/esp/blufi/nimble_host
-endif
-
-endif
diff --git a/components/bt/test/component.mk b/components/bt/test/component.mk
deleted file mode 100644
index 55e05e4239..0000000000
--- a/components/bt/test/component.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-ifdef CONFIG_BT_ENABLED
-COMPONENT_ADD_LDFLAGS = -Wl,--whole-archive -l$(COMPONENT_NAME) -Wl,--no-whole-archive
-else
-COMPONENT_CONFIG_ONLY := 1
-endif
diff --git a/components/cbor/component.mk b/components/cbor/component.mk
deleted file mode 100644
index 211ec49ffd..0000000000
--- a/components/cbor/component.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-COMPONENT_SUBMODULES += tinycbor
-COMPONENT_ADD_INCLUDEDIRS := port/include
-COMPONENT_SRCDIRS :=  tinycbor/src
-COMPONENT_PRIV_INCLUDEDIRS := tinycbor/src
-
-tinycbor/src/open_memstream.o: CFLAGS += -D__linux__
diff --git a/components/cmock/Makefile.projbuild b/components/cmock/Makefile.projbuild
deleted file mode 100644
index 39d01abd2b..0000000000
--- a/components/cmock/Makefile.projbuild
+++ /dev/null
@@ -1 +0,0 @@
-CPPFLAGS += -DUNITY_INCLUDE_CONFIG_H
diff --git a/components/cmock/component.mk b/components/cmock/component.mk
deleted file mode 100644
index ebd7a7d59b..0000000000
--- a/components/cmock/component.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-#
-# Component Makefile
-#
diff --git a/components/coap/component.mk b/components/coap/component.mk
deleted file mode 100644
index 19ef7fd50b..0000000000
--- a/components/coap/component.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# Component Makefile
-#
-
-ifdef CONFIG_LWIP_IPV6
-
-COMPONENT_ADD_INCLUDEDIRS := port/include port/include libcoap/include
-
-COMPONENT_OBJS = libcoap/src/address.o libcoap/src/async.o libcoap/src/block.o libcoap/src/coap_asn1.o libcoap/src/coap_cache.o libcoap/src/coap_debug.o libcoap/src/coap_event.o libcoap/src/coap_hashkey.o libcoap/src/coap_io.o libcoap/src/coap_mbedtls.o libcoap/src/coap_notls.o libcoap/src/coap_prng.o libcoap/src/coap_session.o libcoap/src/coap_tcp.o libcoap/src/coap_time.o libcoap/src/encode.o libcoap/src/mem.o libcoap/src/net.o libcoap/src/option.o libcoap/src/pdu.o libcoap/src/resource.o libcoap/src/str.o libcoap/src/subscribe.o libcoap/src/uri.o
-
-COMPONENT_SRCDIRS := libcoap/src libcoap port
-
-COMPONENT_SUBMODULES += libcoap
-
-# Silence format truncation warning, until it is fixed upstream
-# libcoap/src/coap_debug.o: CFLAGS += -Wno-format-truncation
-
-endif  # CONFIG_LWIP_IPV6
diff --git a/components/console/component.mk b/components/console/component.mk
deleted file mode 100644
index 703e86d80d..0000000000
--- a/components/console/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-COMPONENT_ADD_INCLUDEDIRS := .
-COMPONENT_SRCDIRS := linenoise argtable3 .
-
-argtable3/argtable3.o: CFLAGS += -Wno-clobbered
diff --git a/components/console/test/component.mk b/components/console/test/component.mk
deleted file mode 100644
index 8b9586c0b3..0000000000
--- a/components/console/test/component.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-#Component Makefile
-#
-
-COMPONENT_SRCDIRS := .
-
-COMPONENT_ADD_LDFLAGS = -Wl,--whole-archive -l$(COMPONENT_NAME) -Wl,--no-whole-archive
diff --git a/components/cxx/component.mk b/components/cxx/component.mk
deleted file mode 100644
index 7b5a1d0a6e..0000000000
--- a/components/cxx/component.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-# Mark __cxa_guard_dummy as undefined so that implementation of static guards
-# is taken from cxx_guards.o instead of libstdc++.a
-COMPONENT_ADD_LDFLAGS += -u __cxa_guard_dummy
-
-ifndef CONFIG_COMPILER_CXX_EXCEPTIONS
-# If exceptions are disabled, ensure our fatal exception
-# hooks are preferentially linked over libstdc++ which
-# has full exception support
-WRAP_FUNCTIONS = _Unwind_SetEnableExceptionFdeSorting __register_frame_info_bases __register_frame_info __register_frame __register_frame_info_table_bases __register_frame_info_table __register_frame_table __deregister_frame_info_bases __deregister_frame_info _Unwind_Find_FDE _Unwind_GetGR _Unwind_GetCFA _Unwind_GetIP _Unwind_GetIPInfo _Unwind_GetRegionStart _Unwind_GetDataRelBase _Unwind_GetTextRelBase _Unwind_SetIP _Unwind_SetGR _Unwind_GetLanguageSpecificData _Unwind_FindEnclosingFunction _Unwind_Resume _Unwind_RaiseException _Unwind_DeleteException _Unwind_ForcedUnwind _Unwind_Resume_or_Rethrow _Unwind_Backtrace __cxa_call_unexpected __gxx_personality_v0
-WRAP_ARGUMENT := -Wl,--wrap=
-
-COMPONENT_ADD_LDFLAGS = -l$(COMPONENT_NAME) $(addprefix $(WRAP_ARGUMENT),$(WRAP_FUNCTIONS))
-COMPONENT_ADD_LDFLAGS += -u __cxx_fatal_exception
-
-endif # CONFIG_COMPILER_CXX_EXCEPTIONS
-
-COMPONENT_ADD_INCLUDEDIRS =
diff --git a/components/cxx/test/component.mk b/components/cxx/test/component.mk
deleted file mode 100644
index ce464a212a..0000000000
--- a/components/cxx/test/component.mk
+++ /dev/null
@@ -1 +0,0 @@
-COMPONENT_ADD_LDFLAGS = -Wl,--whole-archive -l$(COMPONENT_NAME) -Wl,--no-whole-archive
diff --git a/components/driver/component.mk b/components/driver/component.mk
deleted file mode 100644
index dd6959ef50..0000000000
--- a/components/driver/component.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# Component Makefile
-#
-COMPONENT_SRCDIRS := . $(IDF_TARGET)
-COMPONENT_OBJEXCLUDE += spi_slave_hd.o dedic_gpio.o gdma.o usb_serial_jtag.o
-
-COMPONENT_ADD_INCLUDEDIRS := include $(IDF_TARGET)/include $(IDF_TARGET)/include/driver
-
-COMPONENT_PRIV_INCLUDEDIRS := include/driver
-
-# uses C11 atomic feature
-spi_master.o: CFLAGS += -std=gnu11
diff --git a/components/driver/test/component.mk b/components/driver/test/component.mk
deleted file mode 100644
index a50df0f375..0000000000
--- a/components/driver/test/component.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-#Component Makefile
-#
-
-COMPONENT_SRCDIRS += param_test touch_sensor_test adc_test
-COMPONENT_PRIV_INCLUDEDIRS += param_test/include touch_sensor_test/include
-
-COMPONENT_ADD_LDFLAGS = -Wl,--whole-archive -l$(COMPONENT_NAME) -Wl,--no-whole-archive
diff --git a/components/efuse/Makefile.projbuild b/components/efuse/Makefile.projbuild
deleted file mode 100644
index 5f552ebb67..0000000000
--- a/components/efuse/Makefile.projbuild
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-# eFuse Manager ganeretes header file.
-#
-.PHONY: efuse_custom_table efuse_common_table efuse_test_table show_efuse_table
-
-GEN_EFUSE_TABLE := $(PYTHON) $(COMPONENT_PATH)/efuse_table_gen.py
-
-GEN_EFUSE_TABLE_ARG := --max_blk_len $(CONFIG_EFUSE_MAX_BLK_LEN)
-
-
-###################
-# Make common files esp_efuse_table.c and include/esp_efuse_table.h files.
-SOC_NAME := $(IDF_TARGET)
-EFUSE_COMMON_TABLE_CSV_PATH := $(COMPONENT_PATH)/$(SOC_NAME)/esp_efuse_table.csv
-
-efuse_common_table:
-	@echo "COMMON_TABLE_CSV: $(EFUSE_COMMON_TABLE_CSV_PATH)"
-	$(GEN_EFUSE_TABLE) $(EFUSE_COMMON_TABLE_CSV_PATH) $(GEN_EFUSE_TABLE_ARG)
-
-
-###################
-# Make custom files project/main/esp_efuse_custom_table.c and project/main/include/esp_efuse_custom_table.h files.
-ifdef CONFIG_EFUSE_CUSTOM_TABLE
-# Path to CSV file is relative to project path for custom CSV files.
-EFUSE_CUSTOM_TABLE_CSV_PATH := $(call dequote,$(abspath $(call dequote, $(PROJECT_PATH))/$(call dequote,$(CONFIG_EFUSE_CUSTOM_TABLE_FILENAME))))
-
-efuse_custom_table:
-	@echo "COMMON_TABLE_CSV: $(EFUSE_COMMON_TABLE_CSV_PATH)"
-	@echo "CUSTOM_TABLE_CSV: $(EFUSE_CUSTOM_TABLE_CSV_PATH)"
-	$(GEN_EFUSE_TABLE) $(EFUSE_COMMON_TABLE_CSV_PATH) $(EFUSE_CUSTOM_TABLE_CSV_PATH) $(GEN_EFUSE_TABLE_ARG)
-
-else
-efuse_custom_table:
-EFUSE_CUSTOM_TABLE_CSV_PATH :=
-EFUSE_CUSTOM_TABLE_OUT_PATH :=
-endif # ifdef CONFIG_EFUSE_CUSTOM_TABLE
-
-
-###################
-# print to console efuse table
-show_efuse_table:
-	$(GEN_EFUSE_TABLE) $(EFUSE_COMMON_TABLE_CSV_PATH) $(EFUSE_CUSTOM_TABLE_CSV_PATH) $(GEN_EFUSE_TABLE_ARG) --info
-
-
-###################
-# Generates files for unit test. This command is run manually.
-EFUSE_TEST_TABLE_CSV_PATH := $(COMPONENT_PATH)/test/esp_efuse_test_table.csv
-efuse_test_table:
-	$(GEN_EFUSE_TABLE) $(EFUSE_TEST_TABLE_CSV_PATH) $(GEN_EFUSE_TABLE_ARG)
diff --git a/components/efuse/component.mk b/components/efuse/component.mk
deleted file mode 100644
index f1a06e7bfc..0000000000
--- a/components/efuse/component.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# Component Makefile
-# currently the only SoC supported; to be moved into Kconfig
-TARGET := $(IDF_TARGET)
-
-COMPONENT_SRCDIRS := $(TARGET) src
-ifdef CONFIG_IDF_TARGET_ESP32
-COMPONENT_OBJEXCLUDE := src/esp_efuse_api_key_esp32xx.o
-else
-COMPONENT_OBJEXCLUDE := src/esp_efuse_api_key_esp32.o
-endif
-
-COMPONENT_PRIV_INCLUDEDIRS := private_include $(TARGET)/private_include
-COMPONENT_ADD_INCLUDEDIRS := include $(TARGET)/include
-
-ifdef CONFIG_EFUSE_VIRTUAL
-$(info eFuse virtual mode is enabled. If Secure boot or Flash encryption is enabled then it does not provide any security. FOR TESTING ONLY!)
-endif
diff --git a/components/efuse/test/component.mk b/components/efuse/test/component.mk
deleted file mode 100644
index e1f27bc79e..0000000000
--- a/components/efuse/test/component.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-#Component Makefile
-#
-COMPONENT_ADD_INCLUDEDIRS := include
-COMPONENT_SRCDIRS := . ${IDF_TARGET}
-COMPONENT_PRIV_INCLUDEDIRS = "../private_include"
-
-COMPONENT_ADD_LDFLAGS = -Wl,--whole-archive -l$(COMPONENT_NAME) -Wl,--no-whole-archive
diff --git a/components/esp-tls/component.mk b/components/esp-tls/component.mk
deleted file mode 100644
index 6520d7db81..0000000000
--- a/components/esp-tls/component.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-
-COMPONENT_SRCDIRS := . esp-tls-crypto
-COMPONENT_OBJS := esp_tls.o esp-tls-crypto/esp_tls_crypto.o esp_tls_error_capture.o
-
-COMPONENT_ADD_INCLUDEDIRS := . esp-tls-crypto private_include
-
-
-ifneq ($(CONFIG_ESP_TLS_USING_MBEDTLS), )
-COMPONENT_OBJS += esp_tls_mbedtls.o
-endif
-
-ifneq ($(CONFIG_ESP_TLS_USING_WOLFSSL), )
-COMPONENT_OBJS += esp_tls_wolfssl.o
-endif
-
-CFLAGS += -DWOLFSSL_USER_SETTINGS
diff --git a/components/esp-tls/test/component.mk b/components/esp-tls/test/component.mk
deleted file mode 100644
index 8c6eb513e4..0000000000
--- a/components/esp-tls/test/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-#Component Makefile
-#
-COMPONENT_ADD_LDFLAGS = -Wl,--whole-archive -l$(COMPONENT_NAME) -Wl,--no-whole-archive
diff --git a/components/esp32/component.mk b/components/esp32/component.mk
deleted file mode 100644
index ebd7a7d59b..0000000000
--- a/components/esp32/component.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-#
-# Component Makefile
-#
diff --git a/components/esp32c3/Makefile.projbuild b/components/esp32c3/Makefile.projbuild
deleted file mode 100644
index cb10139573..0000000000
--- a/components/esp32c3/Makefile.projbuild
+++ /dev/null
@@ -1 +0,0 @@
-# ESP32-C3 is not supported in the GNU Make build system.
diff --git a/components/esp32c3/component.mk b/components/esp32c3/component.mk
deleted file mode 100644
index a2f7dc1797..0000000000
--- a/components/esp32c3/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# Component Makefile
-#
-COMPONENT_CONFIG_ONLY := 1
diff --git a/components/esp32h2/Makefile.projbuild b/components/esp32h2/Makefile.projbuild
deleted file mode 100644
index d79da62ad4..0000000000
--- a/components/esp32h2/Makefile.projbuild
+++ /dev/null
@@ -1 +0,0 @@
-# ESP32-H2 is not supported in the GNU Make build system.
diff --git a/components/esp32h2/component.mk b/components/esp32h2/component.mk
deleted file mode 100644
index a2f7dc1797..0000000000
--- a/components/esp32h2/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# Component Makefile
-#
-COMPONENT_CONFIG_ONLY := 1
diff --git a/components/esp32s2/Makefile.projbuild b/components/esp32s2/Makefile.projbuild
deleted file mode 100644
index 7c70363e3d..0000000000
--- a/components/esp32s2/Makefile.projbuild
+++ /dev/null
@@ -1 +0,0 @@
-# nothing here, esp32s2 is not suppoted in Make build system
diff --git a/components/esp32s2/component.mk b/components/esp32s2/component.mk
deleted file mode 100644
index a2f7dc1797..0000000000
--- a/components/esp32s2/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# Component Makefile
-#
-COMPONENT_CONFIG_ONLY := 1
diff --git a/components/esp32s3/Makefile.projbuild b/components/esp32s3/Makefile.projbuild
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/components/esp32s3/component.mk b/components/esp32s3/component.mk
deleted file mode 100644
index 4ce8ddcab8..0000000000
--- a/components/esp32s3/component.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Component Makefile
-#
-# ESP32-S3 is not supported in GNU Make build system
-COMPONENT_CONFIG_ONLY := 1
diff --git a/components/esp_adc_cal/component.mk b/components/esp_adc_cal/component.mk
deleted file mode 100644
index 99814f4f86..0000000000
--- a/components/esp_adc_cal/component.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Component Makefile
-#
-
-COMPONENT_ADD_INCLUDEDIRS := include
-COMPONENT_OBJEXCLUDE += esp_adc_cal_esp32s2.o esp_adc_cal_esp32c3.o esp_adc_cal_esp32h2.o esp_adc_cal_esp32s3.o esp_adc_cal_esp8684.o
diff --git a/components/esp_common/component.mk b/components/esp_common/component.mk
deleted file mode 100644
index 7ce3ea3b6e..0000000000
--- a/components/esp_common/component.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Component Makefile
-#
-
-COMPONENT_ADD_INCLUDEDIRS := include
-COMPONENT_SRCDIRS := src
-
-COMPONENT_ADD_LDFRAGMENTS += common.lf soc.lf
diff --git a/components/esp_common/test/component.mk b/components/esp_common/test/component.mk
deleted file mode 100644
index 5dd172bdb7..0000000000
--- a/components/esp_common/test/component.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-#Component Makefile
-#
-
-COMPONENT_ADD_LDFLAGS = -Wl,--whole-archive -l$(COMPONENT_NAME) -Wl,--no-whole-archive
diff --git a/components/esp_eth/component.mk b/components/esp_eth/component.mk
deleted file mode 100644
index 3426f54cde..0000000000
--- a/components/esp_eth/component.mk
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-# Component Makefile
-#
-COMPONENT_ADD_INCLUDEDIRS := include
-COMPONENT_SRCDIRS := src
-
-ifndef CONFIG_ETH_USE_ESP32_EMAC
-    COMPONENT_OBJEXCLUDE += src/esp_eth_mac_esp.o
-endif
-
-ifndef CONFIG_ETH_SPI_ETHERNET_DM9051
-    COMPONENT_OBJEXCLUDE += src/esp_eth_mac_dm9051.o src/esp_eth_phy_dm9051.o
-endif
-
-ifndef CONFIG_ETH_SPI_ETHERNET_W5500
-    COMPONENT_OBJEXCLUDE += src/esp_eth_mac_w5500.o src/esp_eth_phy_w5500.o
-endif
-
-ifndef CONFIG_ETH_SPI_ETHERNET_KSZ8851SNL
-    COMPONENT_OBJEXCLUDE += src/esp_eth_mac_ksz8851snl.o src/esp_eth_phy_ksz8851snl.o
-endif
-
-ifndef CONFIG_ETH_USE_OPENETH
-    COMPONENT_OBJEXCLUDE += src/esp_eth_mac_openeth.o
-endif
-
-# uses C11 atomic feature
-src/esp_eth.o: CFLAGS += -std=gnu11
diff --git a/components/esp_eth/test/component.mk b/components/esp_eth/test/component.mk
deleted file mode 100644
index 6533b7fa95..0000000000
--- a/components/esp_eth/test/component.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-#Component Makefile
-#
-
-COMPONENT_SRCDIRS := .
-
-COMPONENT_ADD_LDFLAGS = -Wl,--whole-archive -l$(COMPONENT_NAME) -Wl,--no-whole-archive
-
-COMPONENT_EMBED_TXTFILES := dl_espressif_com_root_cert.pem
diff --git a/components/esp_event/component.mk b/components/esp_event/component.mk
deleted file mode 100644
index b7bb3a8ca7..0000000000
--- a/components/esp_event/component.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# Component Makefile
-#
-COMPONENT_ADD_INCLUDEDIRS := include
-COMPONENT_PRIV_INCLUDEDIRS := private_include
-COMPONENT_SRCDIRS := .
-COMPONENT_ADD_LDFRAGMENTS := linker.lf
-
-ifdef CONFIG_ESP_EVENT_LOOP_PROFILING
-	PROFILING_ENABLED := 1
-else
-	PROFILING_ENABLED := 0
-endif
-
-ifeq ($(PROFILING_ENABLED), 1)
-# uses C11 atomic feature
-esp_event.o: CFLAGS += -std=gnu11
-endif
diff --git a/components/esp_event/test/component.mk b/components/esp_event/test/component.mk
deleted file mode 100644
index b3b8a369be..0000000000
--- a/components/esp_event/test/component.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-#Component Makefile
-#
-
-COMPONENT_PRIV_INCLUDEDIRS := ../private_include .
-COMPONENT_ADD_LDFLAGS = -Wl,--whole-archive -l$(COMPONENT_NAME) -Wl,--no-whole-archive
diff --git a/components/esp_gdbstub/component.mk b/components/esp_gdbstub/component.mk
deleted file mode 100644
index 91e522594d..0000000000
--- a/components/esp_gdbstub/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-COMPONENT_ADD_INCLUDEDIRS := include
-COMPONENT_PRIV_INCLUDEDIRS := private_include esp32 xtensa
-COMPONENT_SRCDIRS := src esp32 xtensa esp_common
-COMPONENT_ADD_LDFRAGMENTS += linker.lf
diff --git a/components/esp_hid/component.mk b/components/esp_hid/component.mk
deleted file mode 100644
index 938edb9017..0000000000
--- a/components/esp_hid/component.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-COMPONENT_ADD_INCLUDEDIRS := include
-COMPONENT_PRIV_INCLUDEDIRS := private
-COMPONENT_SRCDIRS := src
diff --git a/components/esp_hid/test/component.mk b/components/esp_hid/test/component.mk
deleted file mode 100644
index ce464a212a..0000000000
--- a/components/esp_hid/test/component.mk
+++ /dev/null
@@ -1 +0,0 @@
-COMPONENT_ADD_LDFLAGS = -Wl,--whole-archive -l$(COMPONENT_NAME) -Wl,--no-whole-archive
diff --git a/components/esp_http_client/component.mk b/components/esp_http_client/component.mk
deleted file mode 100644
index 96b5b6c4c0..0000000000
--- a/components/esp_http_client/component.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Component Makefile
-#
-
-COMPONENT_SRCDIRS :=  . lib
-COMPONENT_PRIV_INCLUDEDIRS := lib/include
diff --git a/components/esp_http_client/test/component.mk b/components/esp_http_client/test/component.mk
deleted file mode 100644
index ce464a212a..0000000000
--- a/components/esp_http_client/test/component.mk
+++ /dev/null
@@ -1 +0,0 @@
-COMPONENT_ADD_LDFLAGS = -Wl,--whole-archive -l$(COMPONENT_NAME) -Wl,--no-whole-archive
diff --git a/components/esp_http_server/component.mk b/components/esp_http_server/component.mk
deleted file mode 100644
index e34ca07375..0000000000
--- a/components/esp_http_server/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-
-COMPONENT_SRCDIRS := src src/util
-COMPONENT_ADD_INCLUDEDIRS := include
-COMPONENT_PRIV_INCLUDEDIRS := src/port/esp32 src/util
diff --git a/components/esp_http_server/test/component.mk b/components/esp_http_server/test/component.mk
deleted file mode 100644
index ce464a212a..0000000000
--- a/components/esp_http_server/test/component.mk
+++ /dev/null
@@ -1 +0,0 @@
-COMPONENT_ADD_LDFLAGS = -Wl,--whole-archive -l$(COMPONENT_NAME) -Wl,--no-whole-archive
diff --git a/components/esp_https_ota/component.mk b/components/esp_https_ota/component.mk
deleted file mode 100644
index ebe80ffbe6..0000000000
--- a/components/esp_https_ota/component.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-COMPONENT_SRCDIRS := src
-
-COMPONENT_ADD_INCLUDEDIRS := include
diff --git a/components/esp_https_server/component.mk b/components/esp_https_server/component.mk
deleted file mode 100644
index c90f6ee255..0000000000
--- a/components/esp_https_server/component.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-ifdef CONFIG_ESP_HTTPS_SERVER_ENABLE
-COMPONENT_SRCDIRS := src
-COMPONENT_ADD_INCLUDEDIRS := include
-else
-COMPONENT_CONFIG_ONLY := 1
-endif
diff --git a/components/esp_hw_support/Makefile.projbuild b/components/esp_hw_support/Makefile.projbuild
deleted file mode 100644
index 6b69fb23c4..0000000000
--- a/components/esp_hw_support/Makefile.projbuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Enable psram cache bug workaround in compiler if selected
-
-ifdef CONFIG_SPIRAM_CACHE_WORKAROUND
-SPIRAM_CACHE_WORKAROUND_FLAGS = -mfix-esp32-psram-cache-issue
-
-ifdef CONFIG_SPIRAM_CACHE_WORKAROUND_STRATEGY_DUPLDST
-SPIRAM_CACHE_WORKAROUND_FLAGS += -mfix-esp32-psram-cache-strategy=dupldst
-endif
-ifdef CONFIG_SPIRAM_CACHE_WORKAROUND_STRATEGY_MEMW
-SPIRAM_CACHE_WORKAROUND_FLAGS += -mfix-esp32-psram-cache-strategy=memw
-endif
-ifdef CONFIG_SPIRAM_CACHE_WORKAROUND_STRATEGY_NOPS
-SPIRAM_CACHE_WORKAROUND_FLAGS += -mfix-esp32-psram-cache-strategy=nops
-endif
-
-CFLAGS+=$(SPIRAM_CACHE_WORKAROUND_FLAGS)
-CXXFLAGS+=$(SPIRAM_CACHE_WORKAROUND_FLAGS)
-LDFLAGS+=$(SPIRAM_CACHE_WORKAROUND_FLAGS)
-endif
diff --git a/components/esp_hw_support/component.mk b/components/esp_hw_support/component.mk
deleted file mode 100644
index f0f472034f..0000000000
--- a/components/esp_hw_support/component.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-COMPONENT_SRCDIRS := . port/$(IDF_TARGET)
-COMPONENT_ADD_INCLUDEDIRS := . include port/$(IDF_TARGET)/ include/soc include/soc/${IDF_TARGET} port/$(IDF_TARGET)/private_include
-COMPONENT_ADD_LDFRAGMENTS := linker.lf
-
-ifdef IS_BOOTLOADER_BUILD
-COMPONENT_OBJEXCLUDE += clk_ctrl_os.o \
-						intr_alloc.o \
-						sleep_modes.o \
-						sleep_gpio.o \
-						sleep_mac_bb.o \
-						sleep_retention.o \
-						esp_async_memcpy.o \
-						mac_addr.o \
-						regi2c_ctrl.o \
-						port/$(IDF_TARGET)/dport_access.o \
-						port/$(IDF_TARGET)/cache_sram_mmu.o \
-						port/$(IDF_TARGET)/esp_himem.o \
-						port/$(IDF_TARGET)/spiram.o \
-						port/$(IDF_TARGET)/spiram_psram.o
-endif
-
-ifdef CONFIG_IDF_TARGET_ESP32
-COMPONENT_OBJEXCLUDE += sleep_retention.o
-endif
-ifdef CONFIG_IDF_TARGET_ESP32S2
-COMPONENT_OBJEXCLUDE += sleep_retention.o
-endif
-
-COMPONENT_OBJEXCLUDE += esp_async_memcpy.o
diff --git a/components/esp_hw_support/test/component.mk b/components/esp_hw_support/test/component.mk
deleted file mode 100644
index 342bed67fe..0000000000
--- a/components/esp_hw_support/test/component.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-COMPONENT_SRCDIRS := .
-
-COMPONENT_ADD_LDFLAGS = -Wl,--whole-archive -l$(COMPONENT_NAME) -Wl,--no-whole-archive -u ld_include_test_dport_xt_highint5
diff --git a/components/esp_lcd/component.mk b/components/esp_lcd/component.mk
deleted file mode 100644
index 42de4c7e4e..0000000000
--- a/components/esp_lcd/component.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Component Makefile
-#
-COMPONENT_ADD_INCLUDEDIRS := include
-COMPONENT_PRIV_INCLUDEDIRS := interface
-COMPONENT_SRCDIRS := src
diff --git a/components/esp_lcd/test/component.mk b/components/esp_lcd/test/component.mk
deleted file mode 100644
index 8b9586c0b3..0000000000
--- a/components/esp_lcd/test/component.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-#Component Makefile
-#
-
-COMPONENT_SRCDIRS := .
-
-COMPONENT_ADD_LDFLAGS = -Wl,--whole-archive -l$(COMPONENT_NAME) -Wl,--no-whole-archive
diff --git a/components/esp_local_ctrl/component.mk b/components/esp_local_ctrl/component.mk
deleted file mode 100644
index c7d18301d4..0000000000
--- a/components/esp_local_ctrl/component.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-COMPONENT_SRCDIRS := src proto-c
-COMPONENT_ADD_INCLUDEDIRS := include
-COMPONENT_PRIV_INCLUDEDIRS := src proto-c ../protocomm/proto-c/
-
-ifndef CONFIG_BT_BLUEDROID_ENABLED
-	COMPONENT_OBJEXCLUDE += src/esp_local_ctrl_transport_ble.o
-endif
-
-ifndef CONFIG_ESP_HTTPS_SERVER_ENABLE
-	COMPONENT_OBJEXCLUDE += src/esp_local_ctrl_transport_httpd.o
-endif
diff --git a/components/esp_netif/component.mk b/components/esp_netif/component.mk
deleted file mode 100644
index 4896f3cb7e..0000000000
--- a/components/esp_netif/component.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# Component Makefile
-#
-COMPONENT_ADD_INCLUDEDIRS := include
-COMPONENT_PRIV_INCLUDEDIRS := private_include lwip
-COMPONENT_SRCDIRS := . lwip loopback
-
-ifndef CONFIG_LWIP_SLIP_SUPPORT
-    COMPONENT_OBJEXCLUDE := lwip/esp_netif_lwip_slip.o
-endif
-
-ifndef CONFIG_PPP_SUPPORT
-    COMPONENT_OBJEXCLUDE += lwip/esp_netif_lwip_ppp.o
-endif
-
-ifndef CONFIG_LWIP_NETIF_LOOPBACK
-    COMPONENT_OBJEXCLUDE += loopback/esp_netif_loopback.o
-endif
diff --git a/components/esp_netif/test/component.mk b/components/esp_netif/test/component.mk
deleted file mode 100644
index 009d63d124..0000000000
--- a/components/esp_netif/test/component.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-#Component Makefile
-#
-COMPONENT_PRIV_INCLUDEDIRS := ../private_include .
-COMPONENT_ADD_LDFLAGS = -Wl,--whole-archive -l$(COMPONENT_NAME) -Wl,--no-whole-archive
diff --git a/components/esp_phy/Makefile.projbuild b/components/esp_phy/Makefile.projbuild
deleted file mode 100644
index 285d4b4276..0000000000
--- a/components/esp_phy/Makefile.projbuild
+++ /dev/null
@@ -1,40 +0,0 @@
-ifdef CONFIG_ESP_PHY_INIT_DATA_IN_PARTITION
-
-ESP_PHY_COMPONENT_PATH := $(COMPONENT_PATH)
-
-ifdef CONFIG_ESP_PHY_MULTIPLE_INIT_DATA_BIN
-PHY_INIT_DATA_BIN = $(ESP_PHY_COMPONENT_PATH)/$(IDF_TARGET)/phy_multiple_init_data.bin
-else
-PHY_INIT_DATA_OBJ = $(BUILD_DIR_BASE)/phy_init_data.o
-PHY_INIT_DATA_BIN = $(BUILD_DIR_BASE)/phy_init_data.bin
-
-$(PHY_INIT_DATA_OBJ): $(ESP_PHY_COMPONENT_PATH)/$(IDF_TARGET)/include/phy_init_data.h $(BUILD_DIR_BASE)/include/sdkconfig.h
-	$(summary) CC $(notdir $@)
-	printf "#include \"phy_init_data.h\"\n" | $(CC) -I $(BUILD_DIR_BASE)/include -I $(ESP_PHY_COMPONENT_PATH)/../esp_common/include -I $(ESP_PHY_COMPONENT_PATH)/include -I $(ESP_PHY_COMPONENT_PATH)/$(IDF_TARGET)/include -c -o $@ -xc -
-
-$(PHY_INIT_DATA_BIN): $(PHY_INIT_DATA_OBJ)
-	$(summary) BIN $(notdir $@)
-	$(OBJCOPY) -O binary $< $@
-endif
-
-# Command to flash PHY init data partition
-PHY_INIT_DATA_FLASH_CMD = $(ESPTOOLPY_SERIAL) write_flash $(PHY_DATA_OFFSET) $(PHY_INIT_DATA_BIN)
-ESPTOOL_ALL_FLASH_ARGS += $(PHY_DATA_OFFSET) $(PHY_INIT_DATA_BIN)
-
-phy_init_data: $(PHY_INIT_DATA_BIN)
-
-phy_init_data-flash: $(PHY_INIT_DATA_BIN)
-	@echo "Flashing PHY init data..."
-	$(PHY_INIT_DATA_FLASH_CMD)
-
-ifndef CONFIG_ESP_PHY_MULTIPLE_INIT_DATA_BIN
-phy_init_data-clean:
-	rm -f $(PHY_INIT_DATA_BIN) $(PHY_INIT_DATA_OBJ)
-
-clean: phy_init_data-clean
-endif
-
-all: phy_init_data
-flash: phy_init_data
-
-endif # CONFIG_ESP_PHY_INIT_DATA_IN_PARTITION
diff --git a/components/esp_phy/component.mk b/components/esp_phy/component.mk
deleted file mode 100644
index b795371041..0000000000
--- a/components/esp_phy/component.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# Component Makefile
-#
-
-COMPONENT_ADD_INCLUDEDIRS := include $(IDF_TARGET)/include
-COMPONENT_SRCDIRS := src
-
-ifndef CONFIG_ESP32_NO_BLOBS
-    LIBS := phy rtc
-
-    COMPONENT_ADD_LDFLAGS += -L$(COMPONENT_PATH)/lib/$(IDF_TARGET) \
-                          $(addprefix -l,$(LIBS))
-
-    COMPONENT_ADD_LDFRAGMENTS += linker.lf
-
-    COMPONENT_SUBMODULES += lib
-
-    ALL_LIB_FILES := $(patsubst %,$(COMPONENT_PATH)/lib/$(IDF_TARGET)/lib%.a,$(LIBS))
-    COMPONENT_ADD_LINKER_DEPS += $(ALL_LIB_FILES)
-endif
diff --git a/components/esp_phy/test/component.mk b/components/esp_phy/test/component.mk
deleted file mode 100644
index b90f8732cb..0000000000
--- a/components/esp_phy/test/component.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-#Component Makefile
-#
-
-COMPONENT_ADD_LDFLAGS = -Wl,--whole-archive -l$(COMPONENT_NAME) -Wl,--no-whole-archive
-
-COMPONENT_SRCDIRS := .
diff --git a/components/esp_pm/component.mk b/components/esp_pm/component.mk
deleted file mode 100644
index 0afe7e3428..0000000000
--- a/components/esp_pm/component.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-COMPONENT_SRCDIRS := .
-COMPONENT_ADD_INCLUDEDIRS := include
-COMPONENT_ADD_LDFRAGMENTS += linker.lf
diff --git a/components/esp_pm/test/component.mk b/components/esp_pm/test/component.mk
deleted file mode 100644
index 5dd172bdb7..0000000000
--- a/components/esp_pm/test/component.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-#Component Makefile
-#
-
-COMPONENT_ADD_LDFLAGS = -Wl,--whole-archive -l$(COMPONENT_NAME) -Wl,--no-whole-archive
diff --git a/components/esp_ringbuf/component.mk b/components/esp_ringbuf/component.mk
deleted file mode 100644
index cb3a3456bd..0000000000
--- a/components/esp_ringbuf/component.mk
+++ /dev/null
@@ -1 +0,0 @@
-COMPONENT_ADD_LDFRAGMENTS += linker.lf
diff --git a/components/esp_ringbuf/test/component.mk b/components/esp_ringbuf/test/component.mk
deleted file mode 100644
index 5dd172bdb7..0000000000
--- a/components/esp_ringbuf/test/component.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-#Component Makefile
-#
-
-COMPONENT_ADD_LDFLAGS = -Wl,--whole-archive -l$(COMPONENT_NAME) -Wl,--no-whole-archive
diff --git a/components/esp_rom/component.mk b/components/esp_rom/component.mk
deleted file mode 100644
index c68101573e..0000000000
--- a/components/esp_rom/component.mk
+++ /dev/null
@@ -1,50 +0,0 @@
-COMPONENT_ADD_INCLUDEDIRS := include esp32 include/esp32
-COMPONENT_SRCDIRS := patches .
-
-ifdef IS_BOOTLOADER_BUILD
-COMPONENT_OBJEXCLUDE := patches/esp_rom_longjmp.o
-endif
-
-#Linker scripts used to link the final application.
-#Warning: These linker scripts are only used when the normal app is compiled; the bootloader
-#specifies its own scripts.
-LINKER_SCRIPTS += esp32.rom.ld \
-                  esp32.rom.libgcc.ld \
-                  esp32.rom.syscalls.ld \
-                  esp32.rom.newlib-data.ld \
-                  esp32.rom.api.ld
-
-#SPI-RAM incompatible functions can be used in when the SPI RAM
-#workaround is not enabled.
-ifndef CONFIG_SPIRAM_CACHE_WORKAROUND
-LINKER_SCRIPTS += esp32.rom.newlib-funcs.ld
-
-ifdef CONFIG_ESP32_REV_MIN_3
-LINKER_SCRIPTS += esp32.rom.eco3.ld
-endif
-
-# Include in newlib nano from ROM only if SPIRAM cache workaround is disabled
-ifdef CONFIG_NEWLIB_NANO_FORMAT
-LINKER_SCRIPTS += esp32.rom.newlib-nano.ld
-endif
-
-endif #CONFIG_SPIRAM_CACHE_WORKAROUND
-
-ifndef CONFIG_SPI_FLASH_ROM_DRIVER_PATCH
-LINKER_SCRIPTS += esp32.rom.spiflash.ld
-endif
-
-ifndef CONFIG_SDK_TOOLCHAIN_SUPPORTS_TIME_WIDE_64_BITS
-# If SDK_TOOLCHAIN_SUPPORTS_TIME_WIDE_64_BITS option is defined
-# then all time functions from the ROM memory will not be linked.
-# Instead, those functions can be used from the toolchain by ESP-IDF.
-LINKER_SCRIPTS += esp32.rom.newlib-time.ld
-endif
-
-COMPONENT_ADD_LDFLAGS += -L $(COMPONENT_PATH)/esp32/ld \
-                         $(addprefix -T ,$(LINKER_SCRIPTS))
-ifndef IS_BOOTLOADER_BUILD
-COMPONENT_ADD_LDFLAGS += -l$(COMPONENT_NAME) -Wl,--wrap=longjmp
-endif
-
-COMPONENT_ADD_LINKER_DEPS += $(addprefix esp32/ld/, $(LINKER_SCRIPTS))
diff --git a/components/esp_rom/test/component.mk b/components/esp_rom/test/component.mk
deleted file mode 100644
index 07ea1205a5..0000000000
--- a/components/esp_rom/test/component.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-#Component Makefile
-#
-
-COMPONENT_SRCDIRS := .
-
-COMPONENT_ADD_LDFLAGS = -Wl,--whole-archive -l$(COMPONENT_NAME) -Wl,--no-whole-archive
-
-COMPONENT_EXTRA_CLEAN := test_tjpgd_logo.h
-
-test_tjpgd.o: test_tjpgd_logo.h
-
-test_tjpgd_logo.h: $(COMPONENT_PATH)/logo.jpg
-	$(summary) XXD logo.jpg
-	cd $(COMPONENT_PATH); xxd -i logo.jpg $(COMPONENT_BUILD_DIR)/test_tjpgd_logo.h
diff --git a/components/esp_serial_slave_link/component.mk b/components/esp_serial_slave_link/component.mk
deleted file mode 100644
index 23923bbdf9..0000000000
--- a/components/esp_serial_slave_link/component.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Component Makefile
-#
-
-COMPONENT_ADD_INCLUDEDIRS := include
-COMPONENT_PRIV_INCLUDEDIRS := . include/esp_serial_slave_link
diff --git a/components/esp_system/Makefile.projbuild b/components/esp_system/Makefile.projbuild
deleted file mode 100644
index 45209aa293..0000000000
--- a/components/esp_system/Makefile.projbuild
+++ /dev/null
@@ -1,9 +0,0 @@
-ESP32_LINKER_SCRIPT_TEMPLATE := $(COMPONENT_PATH)/ld/esp32/sections.ld.in
-ESP32_LINKER_SCRIPT_OUTPUT_DIR := $(BUILD_DIR_BASE)/esp_system/ld
-ESP32_SECTIONS_LINKER_SCRIPT := $(ESP32_LINKER_SCRIPT_OUTPUT_DIR)/sections.ld
-
-# Target to generate linker script generator from fragments presented by each of
-# the components
-$(eval $(call ldgen_process_template, $(ESP32_LINKER_SCRIPT_TEMPLATE), $(ESP32_SECTIONS_LINKER_SCRIPT)))
-
-$(APP_ELF): $(ESP32_SECTIONS_LINKER_SCRIPT)
diff --git a/components/esp_system/component.mk b/components/esp_system/component.mk
deleted file mode 100644
index c9f1815460..0000000000
--- a/components/esp_system/component.mk
+++ /dev/null
@@ -1,59 +0,0 @@
-ifdef IS_BOOTLOADER_BUILD
-
-ifndef CONFIG_IDF_ENV_FPGA
-COMPONENT_CONFIG_ONLY := 1
-else
-COMPONENT_SRCDIRS := .
-COMPONENT_OBJS += fpga_overrides.o
-endif
-
-else
-SOC_NAME := $(IDF_TARGET)
-
-COMPONENT_SRCDIRS := .
-COMPONENT_ADD_INCLUDEDIRS := include port/public_compat
-COMPONENT_PRIV_INCLUDEDIRS := port/include port
-COMPONENT_ADD_LDFRAGMENTS += linker.lf app.lf
-COMPONENT_DEPENDS := esp_phy
-
-ifndef CONFIG_IDF_ENV_FPGA
-COMPONENT_OBJEXCLUDE += fpga_overrides.o
-endif
-
-# Force linking UBSAN hooks. If UBSAN is not enabled, the hooks will ultimately be removed
-# due to -ffunction-sections -Wl,--gc-sections options.
-COMPONENT_ADD_LDFLAGS += -u __ubsan_include
-
-include $(COMPONENT_PATH)/port/soc/$(SOC_NAME)/component.mk
-
-# disable stack protection in files which are involved in initialization of that feature
-startup.o stack_check.o: CFLAGS := $(filter-out -fstack-protector%, $(CFLAGS))
-
-ld_input := $(COMPONENT_PATH)/ld/esp32/memory.ld.in
-ld_output := $(COMPONENT_BUILD_DIR)/ld/memory.ld
-
-sections_ld := $(COMPONENT_BUILD_DIR)/ld/sections.ld
-
-#Linker scripts used to link the final application.
-#Warning: These linker scripts are only used when the normal app is compiled; the bootloader
-#specifies its own scripts.
-LINKER_SCRIPTS += $(ld_output) $(sections_ld)
-
-#ld_include_highint_hdl is added as an undefined symbol because otherwise the
-#linker will ignore highint_hdl.S as it has no other files depending on any
-#symbols in it.
-COMPONENT_ADD_LDFLAGS += -u ld_include_highint_hdl \
-                         $(addprefix -T ,$(LINKER_SCRIPTS)) \
-
-# Preprocess memory.ld.in linker script into memory.ld
-#
-# The library doesn't really depend on memory.ld, but it
-# saves us from having to add the target to a Makefile.projbuild
-$(COMPONENT_LIBRARY): $(ld_output)
-
-$(ld_output): $(ld_input) ../include/sdkconfig.h
-	mkdir -p $(COMPONENT_BUILD_DIR)/ld
-	$(CC) -I ../include -I $(COMPONENT_PATH)/ld -C -P -x c -E $< -o $@
-
-COMPONENT_EXTRA_CLEAN := $(ld_output) $(sections_ld)
-endif
diff --git a/components/esp_system/port/soc/esp32/component.mk b/components/esp_system/port/soc/esp32/component.mk
deleted file mode 100644
index 02c670c81a..0000000000
--- a/components/esp_system/port/soc/esp32/component.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-COMPONENT_SRCDIRS += port port/soc/esp32 port/arch/xtensa
-COMPONENT_OBJEXCLUDE += port/async_memcpy_impl_gdma.o
diff --git a/components/esp_system/test/component.mk b/components/esp_system/test/component.mk
deleted file mode 100644
index 5dd172bdb7..0000000000
--- a/components/esp_system/test/component.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-#Component Makefile
-#
-
-COMPONENT_ADD_LDFLAGS = -Wl,--whole-archive -l$(COMPONENT_NAME) -Wl,--no-whole-archive
diff --git a/components/esp_timer/Makefile.projbuild b/components/esp_timer/Makefile.projbuild
deleted file mode 100644
index aa4be208c4..0000000000
--- a/components/esp_timer/Makefile.projbuild
+++ /dev/null
@@ -1,6 +0,0 @@
-ifdef CONFIG_ESP_TIMER_IMPL_FRC2
-    # Enable dynamic esp_timer overflow value if building unit tests
-    ifneq ("$(filter esp_timer,$(TEST_COMPONENTS_LIST))","")
-        CPPFLAGS += -DESP_TIMER_DYNAMIC_OVERFLOW_VAL
-    endif
-endif
diff --git a/components/esp_timer/component.mk b/components/esp_timer/component.mk
deleted file mode 100644
index 43b72dec6c..0000000000
--- a/components/esp_timer/component.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Component Makefile
-#
-
-ifdef CONFIG_IDF_TARGET_ESP32
-    COMPONENT_SRCDIRS := src
-    COMPONENT_PRIV_INCLUDEDIRS := private_include
-
-    ifdef CONFIG_ESP_TIMER_IMPL_FRC2
-        # FRC2(legacy) timer is suppoted in esp32
-        COMPONENT_OBJEXCLUDE := src/esp_timer_impl_lac.o
-    endif
-
-    ifdef CONFIG_ESP_TIMER_IMPL_TG0_LAC
-        # TG0_LAC timer is suppoted in esp32
-        COMPONENT_OBJEXCLUDE := src/esp_timer_impl_frc_legacy.o
-    endif
-
-    COMPONENT_OBJEXCLUDE += src/esp_timer_impl_systimer.o
-else
-    $(error esp_timer is only supported by the Make build system for esp32 chip. For other chips, use the Cmake build system)
-endif
diff --git a/components/esp_timer/test/component.mk b/components/esp_timer/test/component.mk
deleted file mode 100644
index beb05c3eac..0000000000
--- a/components/esp_timer/test/component.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-#Component Makefile
-#
-
-COMPONENT_SRCDIRS := .
-COMPONENT_PRIV_INCLUDEDIRS := ../private_include
diff --git a/components/esp_websocket_client/component.mk b/components/esp_websocket_client/component.mk
deleted file mode 100644
index 300fea3da6..0000000000
--- a/components/esp_websocket_client/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-ifdef CONFIG_WS_TRANSPORT
-COMPONENT_SRCDIRS := .
-COMPONENT_ADD_INCLUDEDIRS := include
-endif
diff --git a/components/esp_websocket_client/test/component.mk b/components/esp_websocket_client/test/component.mk
deleted file mode 100644
index 8c6eb513e4..0000000000
--- a/components/esp_websocket_client/test/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-#Component Makefile
-#
-COMPONENT_ADD_LDFLAGS = -Wl,--whole-archive -l$(COMPONENT_NAME) -Wl,--no-whole-archive
diff --git a/components/esp_wifi/component.mk b/components/esp_wifi/component.mk
deleted file mode 100644
index 9efc356ecc..0000000000
--- a/components/esp_wifi/component.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Component Makefile
-#
-
-COMPONENT_ADD_INCLUDEDIRS := include
-COMPONENT_SRCDIRS := src $(IDF_TARGET)
-
-ifndef CONFIG_ESP32_NO_BLOBS
-    LIBS := core net80211 pp smartconfig coexist espnow mesh
-    COMPONENT_ADD_LDFLAGS += -L$(COMPONENT_PATH)/lib/$(IDF_TARGET) \
-                          $(addprefix -l,$(LIBS))
-
-    COMPONENT_ADD_LDFRAGMENTS += linker.lf
-
-    COMPONENT_SUBMODULES += lib
-
-    ALL_LIB_FILES := $(patsubst %,$(COMPONENT_PATH)/lib/$(IDF_TARGET)/lib%.a,$(LIBS))
-    COMPONENT_ADD_LINKER_DEPS += $(ALL_LIB_FILES)
-endif
diff --git a/components/esp_wifi/test/component.mk b/components/esp_wifi/test/component.mk
deleted file mode 100644
index b90f8732cb..0000000000
--- a/components/esp_wifi/test/component.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-#Component Makefile
-#
-
-COMPONENT_ADD_LDFLAGS = -Wl,--whole-archive -l$(COMPONENT_NAME) -Wl,--no-whole-archive
-
-COMPONENT_SRCDIRS := .
diff --git a/components/espcoredump/component.mk b/components/espcoredump/component.mk
deleted file mode 100644
index 439f80a44d..0000000000
--- a/components/espcoredump/component.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-COMPONENT_ADD_INCLUDEDIRS := include
-COMPONENT_SRCDIRS := src
-COMPONENT_PRIV_INCLUDEDIRS := include_core_dump
-COMPONENT_ADD_LDFRAGMENTS += linker.lf
-
-ifdef CONFIG_IDF_TARGET_ARCH_XTENSA
-	COMPONENT_SRCDIRS += src/port/xtensa
-	COMPONENT_ADD_INCLUDEDIRS += include/port/xtensa
-	COMPONENT_PRIV_INCLUDEDIRS += include_core_dump/port/xtensa
-endif
-
-ifdef CONFIG_IDF_TARGET_ARCH_RISCV
-	COMPONENT_SRCDIRS += src/port/riscv
-	COMPONENT_ADD_INCLUDEDIRS += include/port/riscv
-	COMPONENT_PRIV_INCLUDEDIRS += include_core_dump/port/riscv
-endif
diff --git a/components/espcoredump/test/component.mk b/components/espcoredump/test/component.mk
deleted file mode 100644
index b2caff55e6..0000000000
--- a/components/espcoredump/test/component.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-ifeq ($(TESTS_ALL),1)
-    $(info not linking coredump tests from CI)
-else
-    COMPONENT_ADD_LDFLAGS = -Wl,--whole-archive -l$(COMPONENT_NAME) -Wl,--no-whole-archive
-    COMPONENT_SRCDIRS := .
-    COMPONENT_ADD_INCLUDEDIRS := .
-    COMPONENT_PRIV_INCLUDEDIRS := .
-    COMPONENT_REQUIRES := unity nvs_flash
-endif # TESTS_ALL
diff --git a/components/esptool_py/Makefile.projbuild b/components/esptool_py/Makefile.projbuild
deleted file mode 100644
index 2311d7497d..0000000000
--- a/components/esptool_py/Makefile.projbuild
+++ /dev/null
@@ -1,183 +0,0 @@
-# Component support for esptool.py. Doesn't do much by itself,
-# components have their own flash targets that can use these variables.
-ESPPORT ?= $(call dequote,$(CONFIG_ESPTOOLPY_PORT))
-ESPBAUD ?= $(CONFIG_ESPTOOLPY_BAUD)
-ESPFLASHMODE ?= $(CONFIG_ESPTOOLPY_FLASHMODE)
-ESPFLASHFREQ ?= $(CONFIG_ESPTOOLPY_FLASHFREQ)
-ESPFLASHSIZE ?= $(CONFIG_ESPTOOLPY_FLASHSIZE)
-
-CONFIG_ESPTOOLPY_COMPRESSED ?=
-
-PYTHON ?= $(call dequote,$(CONFIG_SDK_PYTHON))
-
-# two commands that can be used from other components
-# to invoke esptool.py (with or without serial port args)
-#
-ESPTOOLPY_SRC := $(COMPONENT_PATH)/esptool/esptool.py
-ESPTOOLPY := $(PYTHON) $(ESPTOOLPY_SRC) --chip esp32
-ESPTOOLPY_SERIAL := $(ESPTOOLPY) --port '$(ESPPORT)' --baud $(ESPBAUD) --before $(CONFIG_ESPTOOLPY_BEFORE) --after $(CONFIG_ESPTOOLPY_AFTER)
-
-# Supporting esptool command line tools
-ESPEFUSEPY := $(PYTHON) $(COMPONENT_PATH)/esptool/espefuse.py
-ESPSECUREPY := $(PYTHON) $(COMPONENT_PATH)/esptool/espsecure.py
-export ESPSECUREPY  # is used in bootloader_support component
-
-ESPTOOL_FLASH_OPTIONS := --flash_mode $(ESPFLASHMODE) --flash_freq $(ESPFLASHFREQ) --flash_size $(ESPFLASHSIZE)
-ifdef CONFIG_ESPTOOLPY_FLASHSIZE_DETECT
-ESPTOOL_WRITE_FLASH_OPTIONS := --flash_mode $(ESPFLASHMODE) --flash_freq $(ESPFLASHFREQ) --flash_size detect
-else
-ESPTOOL_WRITE_FLASH_OPTIONS := $(ESPTOOL_FLASH_OPTIONS)
-endif
-
-ifdef CONFIG_SECURE_SIGNED_APPS_RSA_SCHEME
-ESPTOOL_WRITE_FLASH_OPTIONS := --flash_mode $(ESPFLASHMODE) --flash_freq $(ESPFLASHFREQ) --flash_size keep
-endif
-
-ESPTOOL_ELF2IMAGE_OPTIONS :=
-
-ifdef CONFIG_ESP32_REV_MIN
-ESPTOOL_ELF2IMAGE_OPTIONS += --min-rev $(CONFIG_ESP32_REV_MIN)
-endif
-
-ifndef CONFIG_SECURE_BOOT_ALLOW_SHORT_APP_PARTITION
-ifndef IS_BOOTLOADER_BUILD
-ifdef CONFIG_SECURE_SIGNED_APPS_ECDSA_SCHEME
-ESPTOOL_ELF2IMAGE_OPTIONS += --secure-pad
-else ifdef CONFIG_SECURE_SIGNED_APPS_RSA_SCHEME
-ESPTOOL_ELF2IMAGE_OPTIONS += --secure-pad-v2
-endif
-endif
-endif
-
-ifndef IS_BOOTLOADER_BUILD
-ESPTOOL_ELF2IMAGE_OPTIONS += --elf-sha256-offset 0xb0
-endif
-
-ifdef CONFIG_SECURE_SIGNED_APPS_ECDSA_SCHEME
-SECURE_APPS_SIGNING_SCHEME = "1"
-else ifdef CONFIG_SECURE_SIGNED_APPS_RSA_SCHEME
-SECURE_APPS_SIGNING_SCHEME = "2"
-endif
-
-ESPTOOLPY_WRITE_FLASH=$(ESPTOOLPY_SERIAL) write_flash $(if $(CONFIG_ESPTOOLPY_COMPRESSED),-z,-u) $(ESPTOOL_WRITE_FLASH_OPTIONS)
-
-ifdef CONFIG_SECURE_FLASH_ENCRYPTION_MODE_DEVELOPMENT
-ESPTOOLPY_WRITE_FLASH_ENCRYPT=$(ESPTOOLPY_SERIAL) write_flash --encrypt $(if $(CONFIG_ESPTOOLPY_COMPRESSED),-z,-u) $(ESPTOOL_WRITE_FLASH_OPTIONS)
-endif
-
-ESPTOOL_ALL_FLASH_ARGS += $(APP_OFFSET) $(APP_BIN)
-UF2_ADD_BINARIES += $(APP_OFFSET) $(APP_BIN)
-
-ifdef CONFIG_SECURE_BOOT_BUILD_SIGNED_BINARIES
-ifndef IS_BOOTLOADER_BUILD
-# for locally signed secure boot image, add a signing step to get from unsigned app to signed app
-APP_BIN_UNSIGNED := $(APP_BIN:.bin=-unsigned.bin)
-
-$(APP_BIN): $(APP_BIN_UNSIGNED) $(SECURE_BOOT_SIGNING_KEY) $(SDKCONFIG_MAKEFILE)
-	$(ESPSECUREPY) sign_data --version $(SECURE_APPS_SIGNING_SCHEME) --keyfile $(SECURE_BOOT_SIGNING_KEY) -o $@ $<
-endif
-endif
-# non-secure boot (or bootloader), both these files are the same
-APP_BIN_UNSIGNED ?= $(APP_BIN)
-
-$(APP_BIN_UNSIGNED): $(APP_ELF) $(ESPTOOLPY_SRC) | check_python_dependencies
-ifeq ("$(CONFIG_APP_BUILD_GENERATE_BINARIES)","y")
-	$(ESPTOOLPY) elf2image $(ESPTOOL_FLASH_OPTIONS) $(ESPTOOL_ELF2IMAGE_OPTIONS) -o $@ $<
-else
-	@echo "Skipping the BIN generation"
-endif
-
-ifdef CONFIG_SECURE_FLASH_ENCRYPTION_MODE_DEVELOPMENT
-encrypted-flash: all_binaries $(ESPTOOLPY_SRC) $(call prereq_if_explicit,erase_flash) partition_table_get_info | check_python_dependencies
-	$(eval MONITOR_OPTS += --encrypted)
-	@echo "Flashing binaries to serial port '$(ESPPORT)' (app at offset $(APP_OFFSET))..."
-ifdef CONFIG_SECURE_BOOT
-	@echo "(Secure boot enabled, so bootloader not flashed automatically. See 'make bootloader' output)"
-endif
-	$(ESPTOOLPY_WRITE_FLASH_ENCRYPT) $(ESPTOOL_ALL_FLASH_ARGS)
-else
-encrypted-flash:
-	@echo "The command is supported only in FLASH ENCRYPTION DEVELOPMENT MODE"
-	@exit 1
-endif
-
-flash: all_binaries $(ESPTOOLPY_SRC) $(call prereq_if_explicit,erase_flash) partition_table_get_info | check_python_dependencies
-	@echo "Flashing binaries to serial port '$(ESPPORT)' (app at offset $(APP_OFFSET))..."
-ifdef CONFIG_SECURE_BOOT
-	@echo "(Secure boot enabled, so bootloader not flashed automatically. See 'make bootloader' output)"
-endif
-	$(ESPTOOLPY_WRITE_FLASH) $(ESPTOOL_ALL_FLASH_ARGS)
-
-app-flash: $(APP_BIN) $(ESPTOOLPY_SRC) $(call prereq_if_explicit,erase_flash) partition_table_get_info | check_python_dependencies
-	@echo "Flashing app to serial port '$(ESPPORT)', offset $(APP_OFFSET)..."
-	$(ESPTOOLPY_WRITE_FLASH) $(APP_OFFSET) $(APP_BIN)
-
-ifdef CONFIG_SECURE_FLASH_ENCRYPTION_MODE_DEVELOPMENT
-encrypted-app-flash: $(APP_BIN) $(ESPTOOLPY_SRC) $(call prereq_if_explicit,erase_flash) partition_table_get_info | check_python_dependencies
-	$(eval MONITOR_OPTS += --encrypted)
-	@echo "Flashing encrypted app binary to serial port '$(ESPPORT)' (app at offset $(APP_OFFSET))..."
-	$(ESPTOOLPY_WRITE_FLASH_ENCRYPT) $(APP_OFFSET) $(APP_BIN)
-else
-encrypted-app-flash:
-	@echo "The command is supported only in FLASH ENCRYPTION DEVELOPMENT MODE"
-	@exit 1
-endif
-
-# Submodules normally added in component.mk, but can be added
-# at the project level as long as qualified path
-COMPONENT_SUBMODULES += $(COMPONENT_PATH)/esptool
-
-erase_flash: | check_python_dependencies
-	@echo "Erasing entire flash..."
-	$(ESPTOOLPY_SERIAL) erase_flash
-
-MONITORBAUD ?= $(CONFIG_ESPTOOLPY_MONITOR_BAUD)
-
-MONITOR_PYTHON := $(PYTHON)
-
-ifeq ("$(OS)","Windows_NT")
-# miniterm and idf_monitor both need a Windows Console PTY in order
-# to correctly handle user input
-MONITOR_PYTHON := winpty $(PYTHON)
-endif
-
-# note: if you want to run miniterm from command line, can simply run
-# miniterm.py on the console. The '$(PYTHON) -m serial.tools.miniterm'
-# is to allow for the $(PYTHON) variable overriding the python path.
-simple_monitor: $(call prereq_if_explicit,%flash) | check_python_dependencies
-	$(MONITOR_PYTHON) -m serial.tools.miniterm --rts 0 --dtr 0 --raw '$(ESPPORT)' $(MONITORBAUD)
-
-PRINT_FILTER ?=
-
-MONITOR_CORE_DUMP_DECODE_ARG ?=
-MONITOR_CORE_DUMP_DECODE = $(call dequote,$(CONFIG_ESP_COREDUMP_DECODE))
-ifneq ("$(MONITOR_CORE_DUMP_DECODE)","")
-MONITOR_CORE_DUMP_DECODE_ARG = --decode-coredumps $(MONITOR_CORE_DUMP_DECODE)
-endif
-
-MONITOR_OPTS := --baud $(MONITORBAUD) --port '$(ESPPORT)' --toolchain-prefix $(CONFIG_SDK_TOOLPREFIX) --make "$(MAKE)" --print_filter "$(PRINT_FILTER)" $(MONITOR_CORE_DUMP_DECODE_ARG)
-
-monitor: $(call prereq_if_explicit,%flash) | check_python_dependencies
-	$(summary) MONITOR
-	[ -f $(APP_ELF) ] || echo "*** 'make monitor' target requires an app to be compiled and flashed first."
-	[ -f $(APP_ELF) ] || echo "*** Run 'make flash monitor' to build, flash and monitor"
-	[ -f $(APP_ELF) ] || echo "*** Or alternatively 'make simple_monitor' to view the serial port as-is."
-	[ -f $(APP_ELF) ] || exit 1
-	$(MONITOR_PYTHON) $(IDF_PATH)/tools/idf_monitor.py $(MONITOR_OPTS) $(APP_ELF)
-
-# Make supports ESP32 only
-UF2_CHIP_ID = "0x1c5f21b0"
-
-uf2-app: $(APP_BIN) partition_table_get_info
-	$(PYTHON) $(IDF_PATH)/tools/mkuf2.py write \
-		-o "$(BUILD_DIR_BASE)/uf2-app.bin" \
-		--chip-id "$(UF2_CHIP_ID)" \
-		$(APP_OFFSET) $(APP_BIN)
-
-uf2: all_binaries
-	$(PYTHON) $(IDF_PATH)/tools/mkuf2.py write \
-		-o "$(BUILD_DIR_BASE)/uf2.bin" \
-		--chip-id "$(UF2_CHIP_ID)" \
-		$(UF2_ADD_BINARIES)
-
-.PHONY: erase_flash
diff --git a/components/esptool_py/component.mk b/components/esptool_py/component.mk
deleted file mode 100644
index 5a2dbfb444..0000000000
--- a/components/esptool_py/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-# esptool_py component is special, because it doesn't contain any
-# IDF source files. It only adds steps via Makefile.projbuild &
-# Kconfig.projbuild
-COMPONENT_CONFIG_ONLY := 1
diff --git a/components/expat/component.mk b/components/expat/component.mk
deleted file mode 100644
index 851f6a8c38..0000000000
--- a/components/expat/component.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# Component Makefile
-#
-COMPONENT_ADD_INCLUDEDIRS := expat/expat/lib port/include
-
-COMPONENT_SRCDIRS := expat/expat/lib port
-
-CFLAGS += -DHAVE_EXPAT_CONFIG_H -DHAVE_GETRANDOM
-# Temporary suppress "fallthrough" warnings until they are fixed in expat repo
-CFLAGS += -Wno-implicit-fallthrough
-
-COMPONENT_SUBMODULES += expat
diff --git a/components/expat/test/component.mk b/components/expat/test/component.mk
deleted file mode 100644
index f985b1d659..0000000000
--- a/components/expat/test/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# Component Makefile
-#
-COMPONENT_ADD_LDFLAGS = -Wl,--whole-archive -l$(COMPONENT_NAME) -Wl,--no-whole-archive
diff --git a/components/fatfs/component.mk b/components/fatfs/component.mk
deleted file mode 100644
index bf33270c13..0000000000
--- a/components/fatfs/component.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-COMPONENT_ADD_INCLUDEDIRS := diskio vfs src
-COMPONENT_SRCDIRS := diskio vfs port/freertos src
-COMPONENT_OBJEXCLUDE := src/diskio.o src/ffsystem.o
diff --git a/components/fatfs/test/component.mk b/components/fatfs/test/component.mk
deleted file mode 100644
index c7e0582205..0000000000
--- a/components/fatfs/test/component.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-COMPONENT_ADD_LDFLAGS = -Wl,--whole-archive -l$(COMPONENT_NAME) -Wl,--no-whole-archive
-COMPONENT_EMBED_TXTFILES := fatfs.img
diff --git a/components/freemodbus/component.mk b/components/freemodbus/component.mk
deleted file mode 100644
index c90a5dc720..0000000000
--- a/components/freemodbus/component.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-COMPONENT_ADD_INCLUDEDIRS := common/include
-COMPONENT_PRIV_INCLUDEDIRS := common port modbus modbus/ascii modbus/functions
-COMPONENT_PRIV_INCLUDEDIRS += modbus/rtu modbus/tcp modbus/include
-COMPONENT_PRIV_INCLUDEDIRS += serial_slave/port serial_slave/modbus_controller
-COMPONENT_PRIV_INCLUDEDIRS += serial_master/port serial_master/modbus_controller
-COMPONENT_PRIV_INCLUDEDIRS += tcp_slave/port tcp_slave/modbus_controller
-COMPONENT_PRIV_INCLUDEDIRS += tcp_master/port tcp_master/modbus_controller
-COMPONENT_SRCDIRS := common
-COMPONENT_SRCDIRS += modbus modbus/ascii modbus/functions modbus/rtu modbus/tcp
-COMPONENT_SRCDIRS += serial_slave/port serial_slave/modbus_controller
-COMPONENT_SRCDIRS += serial_master/port serial_master/modbus_controller
-COMPONENT_SRCDIRS += tcp_slave/port tcp_slave/modbus_controller
-COMPONENT_SRCDIRS += tcp_master/port tcp_master/modbus_controller
-COMPONENT_SRCDIRS += port
diff --git a/components/freertos/component.mk b/components/freertos/component.mk
deleted file mode 100644
index 7922d63da8..0000000000
--- a/components/freertos/component.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# Component Makefile
-#
-
-ifdef CONFIG_FREERTOS_DEBUG_OCDAWARE
-	COMPONENT_ADD_LDFLAGS += -Wl,--undefined=uxTopUsedPriority
-endif
-
-COMPONENT_ADD_INCLUDEDIRS := FreeRTOS-Kernel/include esp_additions/include esp_additions/include/freertos FreeRTOS-Kernel/portable/xtensa/include
-COMPONENT_PRIV_INCLUDEDIRS := esp_additions/include esp_additions/include/freertos FreeRTOS-Kernel/include/freertos FreeRTOS-Kernel/portable/xtensa/include/freertos FreeRTOS-Kernel/portable/xtensa FreeRTOS-Kernel/portable/priv_include .
-COMPONENT_SRCDIRS += FreeRTOS-Kernel FreeRTOS-Kernel/portable FreeRTOS-Kernel/portable/xtensa esp_additions/
-
-ifndef CONFIG_ESP32_IRAM_AS_8BIT_ACCESSIBLE_MEMORY
-	COMPONENT_OBJEXCLUDE := xtensa/xtensa_loadstore_handler.o
-endif
-
-tasks.o event_groups.o timers.o queue.o: CFLAGS += -D_ESP_FREERTOS_INTERNAL
-COMPONENT_ADD_LDFRAGMENTS += linker.lf
diff --git a/components/freertos/test/component.mk b/components/freertos/test/component.mk
deleted file mode 100644
index 5dd172bdb7..0000000000
--- a/components/freertos/test/component.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-#Component Makefile
-#
-
-COMPONENT_ADD_LDFLAGS = -Wl,--whole-archive -l$(COMPONENT_NAME) -Wl,--no-whole-archive
diff --git a/components/hal/component.mk b/components/hal/component.mk
deleted file mode 100644
index c5c1e84abc..0000000000
--- a/components/hal/component.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-COMPONENT_SRCDIRS := . esp32
-COMPONENT_ADD_INCLUDEDIRS := esp32/include include platform_port/include
-COMPONENT_ADD_LDFRAGMENTS += linker.lf
-
-COMPONENT_OBJEXCLUDE += ./spi_slave_hd_hal.o ./spi_flash_hal_gpspi.o ./spi_slave_hd_hal.o ./ds_hal.o ./gdma_hal.o ./lcd_hal.o ./systimer_hal.o ./usb_hal.o ./usbh_hal.o ./usb_phy_hal.o ./xt_wdt_hal.o
-
-ifndef CONFIG_ETH_USE_ESP32_EMAC
-    COMPONENT_OBJEXCLUDE += ./emac_hal.o
-endif
-
-ifdef IS_BOOTLOADER_BUILD
-    COMPONENT_OBJEXCLUDE += ./emac_hal.o
-endif
diff --git a/components/hal/test/component.mk b/components/hal/test/component.mk
deleted file mode 100644
index 2efee8e81c..0000000000
--- a/components/hal/test/component.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-COMPONENT_SRCDIRS := .
-
-COMPONENT_ADD_LDFLAGS = -Wl,--whole-archive -l$(COMPONENT_NAME) -Wl,--no-whole-archive
diff --git a/components/heap/component.mk b/components/heap/component.mk
deleted file mode 100644
index 0aa6029ff8..0000000000
--- a/components/heap/component.mk
+++ /dev/null
@@ -1,34 +0,0 @@
-#
-# Component Makefile
-#
-
-COMPONENT_SRCDIRS := . port port/$(IDF_TARGET)
-COMPONENT_ADD_INCLUDEDIRS := include
-COMPONENT_OBJS := heap_caps_init.o heap_caps.o multi_heap.o heap_tlsf.o port/memory_layout_utils.o port/$(IDF_TARGET)/memory_layout.o
-
-ifndef CONFIG_HEAP_POISONING_DISABLED
-COMPONENT_OBJS += multi_heap_poisoning.o
-
-ifdef CONFIG_HEAP_TASK_TRACKING
-COMPONENT_OBJS += heap_task_info.o
-endif
-endif
-
-ifdef CONFIG_HEAP_TRACING_STANDALONE
-
-COMPONENT_OBJS += heap_trace_standalone.o
-
-endif
-
-ifdef CONFIG_HEAP_TRACING
-
-WRAP_FUNCTIONS = calloc malloc free realloc heap_caps_malloc heap_caps_free heap_caps_realloc heap_caps_malloc_default heap_caps_realloc_default
-WRAP_ARGUMENT := -Wl,--wrap=
-
-COMPONENT_ADD_LDFLAGS = -l$(COMPONENT_NAME) $(addprefix $(WRAP_ARGUMENT),$(WRAP_FUNCTIONS))
-
-endif
-
-COMPONENT_ADD_LDFRAGMENTS += linker.lf
-
-CFLAGS += -DMULTI_HEAP_FREERTOS
diff --git a/components/heap/test/component.mk b/components/heap/test/component.mk
deleted file mode 100644
index 5dd172bdb7..0000000000
--- a/components/heap/test/component.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-#Component Makefile
-#
-
-COMPONENT_ADD_LDFLAGS = -Wl,--whole-archive -l$(COMPONENT_NAME) -Wl,--no-whole-archive
diff --git a/components/idf_test/component.mk b/components/idf_test/component.mk
deleted file mode 100644
index 1f26cdc5f9..0000000000
--- a/components/idf_test/component.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Component Makefile
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
-
-# make supports esp32 only
-COMPONENT_ADD_INCLUDEDIRS := include include/esp32
diff --git a/components/jsmn/component.mk b/components/jsmn/component.mk
deleted file mode 100644
index 88f1a9564f..0000000000
--- a/components/jsmn/component.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# Component Makefile
-#
-
-COMPONENT_ADD_INCLUDEDIRS := include/
-COMPONENT_SRCDIRS := src/
-
-ifdef CONFIG_JSMN_PARENT_LINKS
-src/jsmn.o: CPPFLAGS += -DJSMN_PARENT_LINKS
-endif
-
-ifdef CONFIG_JSMN_STRICT
-src/jsmn.o: CPPFLAGS += -DJSMN_STRICT
-endif
diff --git a/components/json/component.mk b/components/json/component.mk
deleted file mode 100644
index 7fbd5db1e2..0000000000
--- a/components/json/component.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Component Makefile
-#
-COMPONENT_ADD_INCLUDEDIRS := cJSON
-COMPONENT_SRCDIRS := cJSON
-COMPONENT_SUBMODULES := cJSON
-COMPONENT_OBJS := cJSON/cJSON.o cJSON/cJSON_Utils.o
diff --git a/components/libsodium/component.mk b/components/libsodium/component.mk
deleted file mode 100644
index 68e91cc5a8..0000000000
--- a/components/libsodium/component.mk
+++ /dev/null
@@ -1,97 +0,0 @@
-COMPONENT_SUBMODULES += libsodium
-
-# Common root directory for all source directories
-LSRC := libsodium/src/libsodium
-
-COMPONENT_SRCDIRS := port
-
-# Derived from libsodium/src/libsodium/Makefile.am
-# (ignoring the !MINIMAL set)
-COMPONENT_SRCDIRS += \
-	$(LSRC)/crypto_aead/chacha20poly1305/sodium \
-	$(LSRC)/crypto_aead/xchacha20poly1305/sodium \
-	$(LSRC)/crypto_auth \
-	$(LSRC)/crypto_auth/hmacsha256 \
-	$(LSRC)/crypto_auth/hmacsha512 \
-	$(LSRC)/crypto_auth/hmacsha512256 \
-	$(LSRC)/crypto_box \
-	$(LSRC)/crypto_box/curve25519xsalsa20poly1305 \
-	$(LSRC)/crypto_core/ed25519 \
-	$(LSRC)/crypto_core/ed25519/ref10 \
-	$(LSRC)/crypto_core/hchacha20 \
-	$(LSRC)/crypto_core/hsalsa20/ref2 \
-	$(LSRC)/crypto_core/hsalsa20 \
-	$(LSRC)/crypto_core/salsa/ref \
-	$(LSRC)/crypto_generichash \
-	$(LSRC)/crypto_generichash/blake2b \
-	$(LSRC)/crypto_generichash/blake2b/ref \
-	$(LSRC)/crypto_hash \
-	$(LSRC)/crypto_hash/sha256 \
-	$(LSRC)/crypto_hash/sha512 \
-	$(LSRC)/crypto_kdf/blake2b \
-	$(LSRC)/crypto_kdf \
-	$(LSRC)/crypto_kx \
-	$(LSRC)/crypto_onetimeauth \
-	$(LSRC)/crypto_onetimeauth/poly1305 \
-	$(LSRC)/crypto_onetimeauth/poly1305/donna \
-	$(LSRC)/crypto_pwhash/argon2 \
-	$(LSRC)/crypto_pwhash \
-	$(LSRC)/crypto_pwhash/scryptsalsa208sha256 \
-	$(LSRC)/crypto_pwhash/scryptsalsa208sha256/nosse \
-	$(LSRC)/crypto_scalarmult \
-	$(LSRC)/crypto_scalarmult/curve25519 \
-	$(LSRC)/crypto_scalarmult/curve25519/ref10 \
-	$(LSRC)/crypto_scalarmult/curve25519/sandy2x \
-	$(LSRC)/crypto_scalarmult/ed25519/ref10 \
-	$(LSRC)/crypto_scalarmult/ristretto255/ref10 \
-	$(LSRC)/crypto_secretbox \
-	$(LSRC)/crypto_secretbox/xsalsa20poly1305 \
-	$(LSRC)/crypto_shorthash \
-	$(LSRC)/crypto_shorthash/siphash24 \
-	$(LSRC)/crypto_shorthash/siphash24/ref \
-	$(LSRC)/crypto_sign \
-	$(LSRC)/crypto_sign/ed25519 \
-	$(LSRC)/crypto_sign/ed25519/ref10 \
-	$(LSRC)/crypto_stream/chacha20 \
-	$(LSRC)/crypto_stream/chacha20/ref \
-	$(LSRC)/crypto_stream \
-	$(LSRC)/crypto_stream/salsa20 \
-    $(LSRC)/crypto_stream/salsa20/ref \
-	$(LSRC)/crypto_stream/xsalsa20 \
-	$(LSRC)/crypto_verify/sodium \
-	$(LSRC)/randombytes \
-	$(LSRC)/sodium
-
-ifdef CONFIG_LIBSODIUM_USE_MBEDTLS_SHA
-COMPONENT_SRCDIRS += port/crypto_hash_mbedtls
-else
-COMPONENT_SRCDIRS += \
-	$(LSRC)/crypto_hash/sha256/cp \
-    $(LSRC)/crypto_hash/sha512/cp
-endif
-
-# Fix some warnings in current libsodium source files
-# (not applied to whole component as we compile some of our own files, also.)
-$(LSRC)/crypto_pwhash/argon2/argon2-fill-block-ref.o: CFLAGS += -Wno-unknown-pragmas
-$(LSRC)/crypto_pwhash/argon2/pwhash_argon2i.o: CFLAGS += -Wno-type-limits
-$(LSRC)/crypto_pwhash/argon2/pwhash_argon2id.o: CFLAGS += -Wno-type-limits
-$(LSRC)/crypto_pwhash/argon2/argon2-core.o: CFLAGS += -Wno-type-limits
-$(LSRC)/crypto_pwhash/scryptsalsa208sha256/pwhash_scryptsalsa208sha256.o: CFLAGS += -Wno-type-limits
-$(LSRC)/sodium/utils.o: CFLAGS += -Wno-unused-variable
-
-COMPONENT_ADD_INCLUDEDIRS := $(LSRC)/include port_include
-COMPONENT_PRIV_INCLUDEDIRS := $(LSRC)/include/sodium port_include/sodium port
-
-
-# Not using autoconf, but this needs to be set
-CFLAGS += -DCONFIGURED -Wno-unused-function
-
-# Add the options from configure.ac (this needs checking if new versions are added )
-CFLAGS +=  -DNATIVE_LITTLE_ENDIAN -DHAVE_WEAK_SYMBOLS -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS
-
-# randombytes.c needs to pull in platform-specific implementation
-$(LSRC)/randombytes/randombytes.o: CFLAGS+=-DRANDOMBYTES_DEFAULT_IMPLEMENTATION
-
-# Temporary suppress "fallthrough" warnings until they are fixed in libsodium repo
-$(LSRC)/crypto_shorthash/siphash24/ref/shorthash_siphashx24_ref.o: CFLAGS += -Wno-implicit-fallthrough
-$(LSRC)/crypto_shorthash/siphash24/ref/shorthash_siphash24_ref.o: CFLAGS += -Wno-implicit-fallthrough
diff --git a/components/libsodium/test/component.mk b/components/libsodium/test/component.mk
deleted file mode 100644
index d28abf9d9a..0000000000
--- a/components/libsodium/test/component.mk
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-#Component Makefile
-#
-
-LS_TESTDIR := ../libsodium/test/default
-LS_TEST_OBJDIR := libsodium/test/default
-
-TESTS_ALL ?= 0
-
-ifeq ($(TESTS_ALL),1)
-$(info not linking libsodium tests, use 'TEST_COMPONENTS=libsodium' to test it)
-else
-COMPONENT_ADD_LDFLAGS = -Wl,--whole-archive -l$(COMPONENT_NAME) -Wl,--no-whole-archive
-endif # TESTS_ALL
-
-COMPONENT_SRCDIRS := . $(LS_TESTDIR)
-
-COMPONENT_PRIV_INCLUDEDIRS := $(LS_TESTDIR)/../quirks
-
-COMPONENT_OBJS := test_sodium.o
-
-# The libsodium test suite is designed to be run each test case as an executable on a desktop computer and uses
-# filesytem to write & then compare contents of each file.
-#
-# For now, use their "BROWSER_TEST" mode with these hacks so that
-# multiple test cases can be combined into one ELF file.
-#
-# Run each test case from test_sodium.c as CASENAME_xmain().
-
-define sodium_testcase
-# This would generate 'warning "main" redefined' warnings at runtime, which are
-# silenced here. Only other solution involves patching libsodium's cmptest.h.
-$(LS_TEST_OBJDIR)/$(1).o: CFLAGS+=-Dxmain=$(1)_xmain -Dmain=$(1)_main
-$(LS_TEST_OBJDIR)/$(1).o: CPPFLAGS+=-Wp,-w
-COMPONENT_OBJS += $(LS_TEST_OBJDIR)/$(1).o
-endef
-
-TEST_CASES := chacha20 aead_chacha20poly1305 box box2 ed25519_convert sign hash
-
-$(foreach case,$(TEST_CASES),$(eval $(call sodium_testcase,$(case))))
-
-# this seems odd, but it prevents the libsodium test harness from
-# trying to write to a file!
-CFLAGS += -DBROWSER_TESTS
diff --git a/components/log/component.mk b/components/log/component.mk
deleted file mode 100644
index 9725ccc561..0000000000
--- a/components/log/component.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# Component Makefile
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
-
-# Simpler condition than in CMakeLists.txt;
-# We assume that FreeRTOS is always included into the build with GNU Make.
-ifndef IS_BOOTLOADER_BUILD
-COMPONENT_OBJEXCLUDE := log_noos.o
-else
-COMPONENT_OBJEXCLUDE := log_freertos.o
-endif
-
-COMPONENT_OBJEXCLUDE += log_linux.o
-
-COMPONENT_ADD_LDFRAGMENTS += linker.lf
diff --git a/components/lwip/component.mk b/components/lwip/component.mk
deleted file mode 100644
index 950860e3ae..0000000000
--- a/components/lwip/component.mk
+++ /dev/null
@@ -1,60 +0,0 @@
-#
-# Component Makefile
-#
-COMPONENT_SUBMODULES += lwip
-
-COMPONENT_ADD_INCLUDEDIRS := \
-	include/apps \
-	include/apps/sntp \
-	lwip/src/include \
-	port/esp32/include \
-	port/esp32/include/arch
-
-COMPONENT_SRCDIRS := \
-	apps/dhcpserver \
-	apps/ping \
-	apps/sntp \
-	lwip/src/api \
-	lwip/src/apps/sntp \
-	lwip/src/apps/netbiosns \
-	lwip/src/core \
-	lwip/src/core/ipv4 \
-	lwip/src/core/ipv6 \
-	lwip/src/netif \
-	port/esp32 \
-	port/esp32/freertos \
-	port/esp32/hooks \
-	port/esp32/netif \
-	port/esp32/debug
-
-ifndef CONFIG_IDF_TARGET_ESP32
-    COMPONENT_OBJEXCLUDE := port/esp32/netif/ethernetif.o
-endif
-ifndef CONFIG_VFS_SUPPORT_IO
-    COMPONENT_OBJEXCLUDE += port/esp32/vfs_lwip.o
-else
-    COMPONENT_OBJEXCLUDE += port/esp32/no_vfs_syscalls.o
-endif
-ifndef CONFIG_OPENTHREAD_ENABLED
-    COMPONENT_OBJEXCLUDE += port/esp32/netif/openthreadif.o
-endif
-
-ifndef CONFIG_LWIP_ICMP
-    COMPONENT_OBJEXCLUDE += apps/ping/esp_ping.o apps/ping/ping.o apps/ping/ping_sock.o
-endif
-
-ifdef CONFIG_LWIP_PPP_SUPPORT
-    COMPONENT_SRCDIRS += lwip/src/netif/ppp lwip/src/netif/ppp/polarssl
-endif
-
-ifndef CONFIG_LWIP_DHCPS
-    COMPONENT_OBJEXCLUDE += apps/dhcpserver/dhcpserver.o
-endif
-
-CFLAGS += -Wno-address  # lots of LWIP source files evaluate macros that check address of stack variables
-
-lwip/src/netif/ppp/ppp.o: CFLAGS += -Wno-uninitialized
-lwip/src/netif/ppp/pppos.o: CFLAGS += -Wno-implicit-fallthrough
-lwip/src/core/tcp.o: CFLAGS += -Wno-type-limits
-
-COMPONENT_ADD_LDFRAGMENTS += linker.lf
diff --git a/components/lwip/test/component.mk b/components/lwip/test/component.mk
deleted file mode 100644
index 8c6eb513e4..0000000000
--- a/components/lwip/test/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-#Component Makefile
-#
-COMPONENT_ADD_LDFLAGS = -Wl,--whole-archive -l$(COMPONENT_NAME) -Wl,--no-whole-archive
diff --git a/components/mbedtls/Makefile.projbuild b/components/mbedtls/Makefile.projbuild
deleted file mode 100644
index 9bfba16938..0000000000
--- a/components/mbedtls/Makefile.projbuild
+++ /dev/null
@@ -1,8 +0,0 @@
-# Anyone compiling mbedTLS code needs the name of the
-# alternative config file
-CPPFLAGS += -DMBEDTLS_CONFIG_FILE='"mbedtls/esp_config.h"'
-
-# Catch usage of deprecated mbedTLS functions when building tests
-ifneq ("$(filter mbedtls,$(TEST_COMPONENTS_LIST))","")
-CPPFLAGS += -DMBEDTLS_DEPRECATED_WARNING
-endif
diff --git a/components/mbedtls/component.mk b/components/mbedtls/component.mk
deleted file mode 100644
index 00e3d20bf0..0000000000
--- a/components/mbedtls/component.mk
+++ /dev/null
@@ -1,99 +0,0 @@
-#
-# Component Makefile
-#
-
-
-COMPONENT_ADD_INCLUDEDIRS := port/include mbedtls/include esp_crt_bundle/include
-
-COMPONENT_SRCDIRS := mbedtls/library port port/$(IDF_TARGET) port/sha port/sha/parallel_engine port/aes port/aes/block port/md esp_crt_bundle
-
-COMPONENT_OBJEXCLUDE := mbedtls/library/net_sockets.o
-
-ifdef CONFIG_MBEDTLS_SSL_PROTO_GMTSSL1_1
-COMPONENT_OBJEXCLUDE += \
-mbedtls/library/ssl_ciphersuites.o \
-mbedtls/library/ecp.o \
-mbedtls/library/cipher_wrap.o \
-mbedtls/library/oid.o \
-mbedtls/library/ecp_curves.o \
-mbedtls/library/pk_wrap.o \
-mbedtls/library/ecdsa.o \
-mbedtls/library/x509_crt.o \
-mbedtls/library/ssl_tls.o \
-mbedtls/library/ssl_cli.o
-endif
-
-COMPONENT_SUBMODULES += mbedtls
-
-
-# Note: some mbedTLS hardware acceleration can be enabled/disabled by config.
-#
-# We don't need to exclude aes.o as these functions use a different prefix (esp_aes_x) and the
-# config option only changes the prefixes in the header so mbedtls_aes_x compiles to esp_aes_x
-#
-# The other port-specific files don't override internal mbedTLS functions, they just add new functions.
-
-ifndef CONFIG_MBEDTLS_HARDWARE_MPI
-    COMPONENT_OBJEXCLUDE += port/esp_bignum.o port/$(IDF_TARGET)/bignum.o
-endif
-
-
-
-ifndef CONFIG_MBEDTLS_HARDWARE_SHA
-    COMPONENT_OBJEXCLUDE += port/parallel_engine/esp_sha1.o port/parallel_engine/esp_sha256.o port/parallel_engine/esp_sha512.o
-endif
-
-ifdef CONFIG_MBEDTLS_CERTIFICATE_BUNDLE
-
-GEN_CRT_BUNDLEPY := $(PYTHON) $(COMPONENT_PATH)/esp_crt_bundle/gen_crt_bundle.py
-DEFAULT_CRT_DIR := ${COMPONENT_PATH}/esp_crt_bundle
-X509_CERTIFICATE_BUNDLE := $(abspath x509_crt_bundle)
-CUSTOM_BUNDLE_PATH := $(PROJECT_PATH)/$(CONFIG_MBEDTLS_CUSTOM_CERTIFICATE_BUNDLE_PATH)
-
-ifdef CONFIG_MBEDTLS_CUSTOM_CERTIFICATE_BUNDLE
-CRT_PATHS += $(CUSTOM_BUNDLE_PATH)
-endif
-
-ifdef CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_DEFAULT_FULL
-CRT_PATHS += ${DEFAULT_CRT_DIR}/cacrt_all.pem
-endif
-
-ifdef CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_DEFAULT_CMN
-CRT_PATHS += ${DEFAULT_CRT_DIR}/cacrt_all.pem
-ARGS += --filter ${DEFAULT_CRT_DIR}/cmn_crt_authorities.csv
-endif
-
-ARGS += --input $(CRT_PATHS) -q
-
-# Generate certificate bundle using generate_cert_bundle.py
-$(X509_CERTIFICATE_BUNDLE) : $(SDKCONFIG_MAKEFILE)
-	$(GEN_CRT_BUNDLEPY) $(ARGS)
-
-COMPONENT_EXTRA_CLEAN += $(X509_CERTIFICATE_BUNDLE)
-
-COMPONENT_EMBED_FILES := $(X509_CERTIFICATE_BUNDLE)
-
-endif
-
-ifdef CONFIG_MBEDTLS_DYNAMIC_BUFFER
-WRAP_FUNCTIONS = mbedtls_ssl_handshake_client_step \
-                 mbedtls_ssl_handshake_server_step \
-                 mbedtls_ssl_read \
-                 mbedtls_ssl_write \
-                 mbedtls_ssl_session_reset \
-                 mbedtls_ssl_free \
-                 mbedtls_ssl_setup \
-                 mbedtls_ssl_send_alert_message \
-                 mbedtls_ssl_close_notify
-
-COMPONENT_SRCDIRS += port/dynamic
-endif
-
-ifdef CONFIG_MBEDTLS_HARDWARE_MPI
-WRAP_FUNCTIONS += mbedtls_mpi_exp_mod
-endif
-
-ifneq ($(origin WRAP_FUNCTIONS),undefined)
-WRAP_ARGUMENT := -Wl,--wrap=
-COMPONENT_ADD_LDFLAGS = -l$(COMPONENT_NAME) $(addprefix $(WRAP_ARGUMENT),$(WRAP_FUNCTIONS))
-endif
diff --git a/components/mbedtls/test/component.mk b/components/mbedtls/test/component.mk
deleted file mode 100644
index 5c4313545b..0000000000
--- a/components/mbedtls/test/component.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-#Component Makefile
-#
-
-COMPONENT_ADD_LDFLAGS = -Wl,--whole-archive -l$(COMPONENT_NAME) -Wl,--no-whole-archive
-COMPONENT_EMBED_FILES := server_cert_chain.pem prvtkey.pem server_cert_bundle
diff --git a/components/mdns/component.mk b/components/mdns/component.mk
deleted file mode 100644
index f22f83094a..0000000000
--- a/components/mdns/component.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-ifdef CONFIG_MDNS_NETWORKING_SOCKET
-COMPONENT_OBJEXCLUDE := mdns_networking_lwip.o
-else
-COMPONENT_OBJEXCLUDE := mdns_networking_socket.o
-endif
-COMPONENT_ADD_INCLUDEDIRS := include
-COMPONENT_PRIV_INCLUDEDIRS := private_include
diff --git a/components/mdns/test/component.mk b/components/mdns/test/component.mk
deleted file mode 100644
index 8c6eb513e4..0000000000
--- a/components/mdns/test/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-#Component Makefile
-#
-COMPONENT_ADD_LDFLAGS = -Wl,--whole-archive -l$(COMPONENT_NAME) -Wl,--no-whole-archive
diff --git a/components/mqtt/component.mk b/components/mqtt/component.mk
deleted file mode 100644
index 19e498025e..0000000000
--- a/components/mqtt/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-COMPONENT_SUBMODULES += esp-mqtt
-COMPONENT_ADD_INCLUDEDIRS := esp-mqtt/include
-COMPONENT_SRCDIRS :=  esp-mqtt esp-mqtt/lib
-COMPONENT_PRIV_INCLUDEDIRS := esp-mqtt/lib/include
diff --git a/components/mqtt/test/component.mk b/components/mqtt/test/component.mk
deleted file mode 100644
index 8c6eb513e4..0000000000
--- a/components/mqtt/test/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-#Component Makefile
-#
-COMPONENT_ADD_LDFLAGS = -Wl,--whole-archive -l$(COMPONENT_NAME) -Wl,--no-whole-archive
diff --git a/components/newlib/Makefile.old b/components/newlib/Makefile.old
deleted file mode 100644
index 88d058b6c4..0000000000
--- a/components/newlib/Makefile.old
+++ /dev/null
@@ -1,47 +0,0 @@
-
-
-TARGET_DIR=$(PWD)/.build
-ROM_ELF_FILE ?= /tmp/eagle.pro.rom.out
-
-all: newlib check_common_syms
-
-newlib_xtensa-2.2.0:
-	git submodule update --init
-
-newlib: newlib_xtensa-2.2.0
-
-newlib:
-	cd newlib_xtensa-2.2.0 && \
-	./configure \
-		--with-newlib \
-		--enable-multilib \
-		--disable-newlib-io-c99-formats \
-		--disable-newlib-supplied-syscalls  \
-		--enable-newlib-nano-formatted-io \
-		--enable-newlib-reent-small \
-		--enable-target-optspace \
-		--program-transform-name="s&^&xtensa-esp108-elf-&" \
-		--disable-option-checking \
-		--with-target-subdir=xtensa-esp108-elf \
-		--target=xtensa-esp108-elf \
-		--prefix=$(TARGET_DIR) \
-	&& CROSS_CFLAGS="-DSIGNAL_PROVIDED -DABORT_PROVIDED -DMALLOC_PROVIDED" make all install || true
-	cp -r $(TARGET_DIR)/xtensa-esp108-elf/{include,lib} ./
-	cp lib/libc.a lib/libc_rom.a
-	xtensa-esp108-elf-ar d lib/libc_rom.a lib_a-nano-vfprintf_float.o
-	xtensa-esp108-elf-ar d lib/libc_rom.a lib_a-nano-vfscanf_float.o
-	while read obj; do xtensa-esp108-elf-ar d lib/libc.a $$obj; done <libc_discard.list
-
-
-clean:
-	rm -rf newlib_xtensa-2.2.0 .build include lib
-
-check_common_syms:
-	@# get symbols in libc.a, except for _printf_float and _scanf_float
-	@xtensa-esp108-elf-nm lib/libc.a | grep -v -E "\W+U\W+" | awk '{print $$3}' | grep -v -E '^$$' | grep -v '_printf_float' | grep -v '_scanf_float' | sort >libc.syms
-	@# get symbols in ROM
-	@xtensa-esp108-elf-nm $(ROM_ELF_FILE) | grep -v -E '\W+U\W+' | awk '{print $$3}' | sort >rom.syms
-	@# check that there are no common symbols
-	@test $$(comm -12 rom.syms libc.syms | tee common.syms | wc -l) -eq 0
-
-.PHONY: all clean newlib
diff --git a/components/newlib/component.mk b/components/newlib/component.mk
deleted file mode 100644
index f633905a67..0000000000
--- a/components/newlib/component.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-ifdef CONFIG_NEWLIB_NANO_FORMAT
-LIBC := c_nano
-else  # CONFIG_NEWLIB_NANO_FORMAT
-LIBC := c
-endif  # CONFIG_NEWLIB_NANO_FORMAT
-
-# Order of linking matters: libnewlib.a should go before libc.a
-COMPONENT_ADD_LDFLAGS := -lnewlib -l$(LIBC) -lm
-COMPONENT_ADD_INCLUDEDIRS := platform_include
-
-ifdef CONFIG_SPIRAM_CACHE_WORKAROUND
-COMPONENT_ADD_LDFRAGMENTS := esp32-spiram-rom-functions-c.lf
-endif
-
-COMPONENT_PRIV_INCLUDEDIRS := priv_include
-COMPONENT_SRCDIRS := . port
-
-# Forces the linker to include heap, syscalls, pthread, and assert from this component,
-# instead of the implementations provided by newlib.
-COMPONENT_ADD_LDFLAGS += -u newlib_include_heap_impl
-COMPONENT_ADD_LDFLAGS += -u newlib_include_syscalls_impl
-COMPONENT_ADD_LDFLAGS += -u newlib_include_pthread_impl
-COMPONENT_ADD_LDFLAGS += -u newlib_include_assert_impl
-
-COMPONENT_ADD_LDFRAGMENTS += newlib.lf system_libs.lf
-
-heap.o: CFLAGS += -fno-builtin
diff --git a/components/newlib/test/component.mk b/components/newlib/test/component.mk
deleted file mode 100644
index 5dd172bdb7..0000000000
--- a/components/newlib/test/component.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-#Component Makefile
-#
-
-COMPONENT_ADD_LDFLAGS = -Wl,--whole-archive -l$(COMPONENT_NAME) -Wl,--no-whole-archive
diff --git a/components/nghttp/Makefile.projbuild b/components/nghttp/Makefile.projbuild
deleted file mode 100644
index d17beccada..0000000000
--- a/components/nghttp/Makefile.projbuild
+++ /dev/null
@@ -1 +0,0 @@
-CPPFLAGS += -DHAVE_CONFIG_H
diff --git a/components/nghttp/component.mk b/components/nghttp/component.mk
deleted file mode 100644
index 10d0bdefbc..0000000000
--- a/components/nghttp/component.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# Component Makefile
-#
-
-COMPONENT_ADD_INCLUDEDIRS := port/include nghttp2/lib/includes
-
-COMPONENT_PRIV_INCLUDEDIRS := private_include
-
-COMPONENT_SRCDIRS := nghttp2/lib port
-
-COMPONENT_SUBMODULES := nghttp2
diff --git a/components/nvs_flash/component.mk b/components/nvs_flash/component.mk
deleted file mode 100644
index 8b2fda4f54..0000000000
--- a/components/nvs_flash/component.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# Component Makefile
-#
-
-COMPONENT_ADD_INCLUDEDIRS := include
-
-COMPONENT_SRCDIRS := src
-
-ifndef CONFIG_NVS_ENCRYPTION
-COMPONENT_OBJEXCLUDE := src/nvs_encr.o
-endif
diff --git a/components/nvs_flash/test/component.mk b/components/nvs_flash/test/component.mk
deleted file mode 100644
index a0ea7a4063..0000000000
--- a/components/nvs_flash/test/component.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-#Component Makefile
-#
-
-COMPONENT_ADD_LDFLAGS = -Wl,--whole-archive -l$(COMPONENT_NAME) -Wl,--no-whole-archive
-COMPONENT_EMBED_TXTFILES += encryption_keys.bin partition_encrypted.bin sample.bin
diff --git a/components/openssl/component.mk b/components/openssl/component.mk
deleted file mode 100644
index cb64d37762..0000000000
--- a/components/openssl/component.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Component Makefile
-#
-
-COMPONENT_ADD_INCLUDEDIRS := include
-COMPONENT_PRIV_INCLUDEDIRS := include/internal include/platform include/openssl
-
-COMPONENT_SRCDIRS := library platform
diff --git a/components/openssl/test/component.mk b/components/openssl/test/component.mk
deleted file mode 100644
index 8c6eb513e4..0000000000
--- a/components/openssl/test/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-#Component Makefile
-#
-COMPONENT_ADD_LDFLAGS = -Wl,--whole-archive -l$(COMPONENT_NAME) -Wl,--no-whole-archive
diff --git a/components/openthread/component.mk b/components/openthread/component.mk
deleted file mode 100644
index b404e35c21..0000000000
--- a/components/openthread/component.mk
+++ /dev/null
@@ -1,78 +0,0 @@
-ifdef CONFIG_OPENTHREAD_ENABLED
-
-COMPONENT_ADD_INCLUDEDIRS :=       \
-    openthread/include             \
-    include
-
-COMPONENT_PRIV_INCLUDEDIRS :=      \
-    openthread/examples/platforms  \
-    openthread/src                 \
-    openthread/src/core            \
-    openthread/src/lib/hdlc        \
-    openthread/src/lib/spinel      \
-    openthread/src/ncp             \
-    private_include
-
-COMPONENT_SRCDIRS :=                      \
-    openthread/examples/apps/cli          \
-    openthread/src/cli                    \
-    openthread/src/core                   \
-    openthread/src/core/api               \
-    openthread/src/core/backbone_router   \
-    openthread/src/core/coap              \
-    openthread/src/core/common            \
-    openthread/src/core/crypto            \
-    openthread/src/core/diags             \
-    openthread/src/core/mac               \
-    openthread/src/core/meshcop           \
-    openthread/src/core/net               \
-    openthread/src/core/radio             \
-    openthread/src/core/thread            \
-    openthread/src/core/utils             \
-    openthread/src/lib/hdlc               \
-    openthread/src/lib/platform           \
-    openthread/src/lib/spinel             \
-    port
-
-ifdef CONFIG_OPENTHREAD_BORDER_ROUTER
-COMPONENT_SRCDIRS += openthread/src/core/border_router
-endif
-
-COMPONENT_OBJEXCLUDE :=                              \
-    openthread/examples/apps/cli/main.o              \
-    openthread/src/core/common/extension_example.o   \
-
-
-COMPONENT_SUBMODULES += lib
-
-ALL_LIB_FILES := $(COMPONENT_PATH)/lib/$(IDF_TARGET)/libopenthread_port.a
-
-ifdef CONFIG_OPENTHREAD_BORDER_ROUTER
-    ALL_LIB_FILES += $(COMPONENT_PATH)/lib/$(IDF_TARGET)/libopenthread_br.a
-endif
-COMPONENT_ADD_LDFLAGS += $(ALL_LIB_FILES)
-
-IDF_VERSION_FOR_OPENTHREAD_PACKAGE := $(shell git -C $(COMPONENT_PATH) rev-parse --short HEAD)
-OPENTHREAD_VERSION := $(shell git -C $(COMPONENT_PATH)/openthread rev-parse --short HEAD)
-OPENTHREAD_PACKAGE_VERSION := $(IDF_VERSION_FOR_OPENTHREAD_PACKAGE)-$(OPENTHREAD_VERSION)
-
-COMMON_FLAGS :=                                                              \
-    -DOPENTHREAD_CONFIG_FILE=\<openthread-core-esp32x-ftd-config.h\>             \
-    -DPACKAGE_VERSION=\"OPENTHREAD_PACKAGE_VERSION\"                         \
-    -Wno-maybe-uninitialized
-
-ifdef CONFIG_OPENTHREAD_FTD
-    COMMON_FLAGS += -DOPENTHREAD_FTD=1
-else ifdef CONFIG_OPENTHREAD_MTD
-    COMMON_FLAGS += -DOPENTHREAD_MTD=1
-else ifdef CONFIG_OPENTHREAD_RADIO
-    COMMON_FLAGS += -DOPENTHREAD_RADIO=1
-endif
-
-CFLAGS += $(COMMON_FLAGS)
-
-CXXFLAGS += $(COMMON_FLAGS)
-
-CPPFLAGS += $(COMMON_FLAGS)
-
-endif
diff --git a/components/partition_table/Makefile.projbuild b/components/partition_table/Makefile.projbuild
deleted file mode 100644
index 7b85adaa0f..0000000000
--- a/components/partition_table/Makefile.projbuild
+++ /dev/null
@@ -1,118 +0,0 @@
-#
-# Partition table
-#
-# The partition table is not a real component that gets linked into
-# the project. Instead, it is a standalone project to generate
-# the partition table binary as part of the build process. This
-# binary is then added to the list of files for esptool.py to flash.
-#
-.PHONY: partition_table partition_table-flash partition_table-clean partition_table_get_info
-
-PARTITION_MD5_OPT :=
-ifndef CONFIG_PARTITION_TABLE_MD5
-PARTITION_MD5_OPT := "--disable-md5sum"
-endif
-
-PARTITION_FLASHSIZE_OPT :=
-ifneq ("$(CONFIG_ESPTOOLPY_FLASHSIZE)", "")
-PARTITION_FLASHSIZE_OPT := --flash-size $(CONFIG_ESPTOOLPY_FLASHSIZE)
-endif
-
-PARTITION_SECURE_OPT :=
-ifdef CONFIG_SECURE_BOOT
-ifndef CONFIG_SECURE_BOOT_ALLOW_SHORT_APP_PARTITION
-PARTITION_SECURE_OPT += --secure
-endif
-endif
-
-# Address of partition table
-PARTITION_TABLE_OFFSET := $(CONFIG_PARTITION_TABLE_OFFSET)
-PARTITION_TABLE_OFFSET_ARG := --offset $(PARTITION_TABLE_OFFSET)
-
-GEN_ESP32PART := $(PYTHON) $(COMPONENT_PATH)/gen_esp32part.py -q $(PARTITION_MD5_OPT) $(PARTITION_FLASHSIZE_OPT) $(PARTITION_TABLE_OFFSET_ARG) $(PARTITION_SECURE_OPT)
-GET_PART_INFO := $(COMPONENT_PATH)/parttool.py -q
-
-# if CONFIG_PARTITION_TABLE_FILENAME is unset, means we haven't re-generated config yet...
-ifneq ("$(CONFIG_PARTITION_TABLE_FILENAME)","")
-
-ifndef PARTITION_TABLE_CSV_PATH
-# Path to partition CSV file is relative to project path for custom
-# partition CSV files, but relative to component dir otherwise.
-PARTITION_TABLE_ROOT := $(call dequote,$(if $(CONFIG_PARTITION_TABLE_CUSTOM),$(PROJECT_PATH),$(COMPONENT_PATH)))
-PARTITION_TABLE_CSV_PATH := $(call dequote,$(abspath $(PARTITION_TABLE_ROOT)/$(call dequote,$(CONFIG_PARTITION_TABLE_FILENAME))))
-endif
-
-PARTITION_TABLE_CSV_NAME := $(notdir $(PARTITION_TABLE_CSV_PATH))
-
-PARTITION_TABLE_BIN := $(BUILD_DIR_BASE)/$(PARTITION_TABLE_CSV_NAME:.csv=.bin)
-
-ifdef CONFIG_SECURE_BOOT_V1_ENABLED
-ifdef CONFIG_SECURE_BOOT_BUILD_SIGNED_BINARIES
-PARTITION_TABLE_BIN_UNSIGNED := $(PARTITION_TABLE_BIN:.bin=-unsigned.bin)
-# add an extra signing step for secure partition table
-$(PARTITION_TABLE_BIN): $(PARTITION_TABLE_BIN_UNSIGNED) $(SDKCONFIG_MAKEFILE) $(SECURE_BOOT_SIGNING_KEY)
-	$(ESPSECUREPY) sign_data --version 1 --keyfile $(SECURE_BOOT_SIGNING_KEY) -o $@ $<
-else
-# secure bootloader disabled, both files are the same
-PARTITION_TABLE_BIN_UNSIGNED := $(PARTITION_TABLE_BIN)
-endif
-else
-# secure bootloader disabled, both files are the same
-PARTITION_TABLE_BIN_UNSIGNED := $(PARTITION_TABLE_BIN)
-endif
-
-$(PARTITION_TABLE_BIN_UNSIGNED): $(PARTITION_TABLE_CSV_PATH) $(SDKCONFIG_MAKEFILE) | check_python_dependencies
-	@echo "Building partitions from $(PARTITION_TABLE_CSV_PATH)..."
-	$(GEN_ESP32PART) $< $@
-
-all_binaries: $(PARTITION_TABLE_BIN) partition_table_get_info check_table_contents
-
-partition_table_get_info: $(PARTITION_TABLE_BIN)
-	$(eval PHY_DATA_OFFSET:=$(shell $(GET_PART_INFO)  --partition-table-file $(PARTITION_TABLE_BIN) \
-							--partition-table-offset $(PARTITION_TABLE_OFFSET) \
-							get_partition_info --partition-type data --partition-subtype phy --info offset))
-	$(eval APP_OFFSET:=$(shell $(GET_PART_INFO) --partition-table-file $(PARTITION_TABLE_BIN) \
-							--partition-table-offset $(PARTITION_TABLE_OFFSET) \
-							get_partition_info --partition-boot-default --info offset))
-	$(eval OTA_DATA_OFFSET:=$(shell $(GET_PART_INFO) --partition-table-file $(PARTITION_TABLE_BIN) \
-							--partition-table-offset $(PARTITION_TABLE_OFFSET) \
-							get_partition_info --partition-type data --partition-subtype ota --info offset))
-	$(eval OTA_DATA_SIZE:=$(shell $(GET_PART_INFO) --partition-table-file $(PARTITION_TABLE_BIN) \
-							--partition-table-offset $(PARTITION_TABLE_OFFSET) \
-							get_partition_info --partition-type data --partition-subtype ota --info size))
-	$(eval FACTORY_OFFSET:=$(shell $(GET_PART_INFO) --partition-table-file $(PARTITION_TABLE_BIN) \
-							--partition-table-offset $(PARTITION_TABLE_OFFSET) \
-							get_partition_info --partition-type app --partition-subtype factory  --info offset))
-
-export APP_OFFSET
-export PHY_DATA_OFFSET
-export OTA_DATA_OFFSET
-export OTA_DATA_SIZE
-
-# If anti-rollback option is set then factory partition should not be in Partition Table.
-# In this case, should be used the partition table with two ota app without the factory.
-check_table_contents: partition_table_get_info
-	@echo $(if $(CONFIG_BOOTLOADER_APP_ANTI_ROLLBACK), $(if $(FACTORY_OFFSET), $(error "ERROR: Anti-rollback option is enabled. Partition table should consist of two ota app without factory partition."), ""), "")
-
-PARTITION_TABLE_FLASH_CMD = $(ESPTOOLPY_SERIAL) write_flash $(PARTITION_TABLE_OFFSET) $(PARTITION_TABLE_BIN)
-ESPTOOL_ALL_FLASH_ARGS += $(PARTITION_TABLE_OFFSET) $(PARTITION_TABLE_BIN)
-UF2_ADD_BINARIES += $(PARTITION_TABLE_OFFSET) $(PARTITION_TABLE_BIN)
-
-partition_table: $(PARTITION_TABLE_BIN) partition_table_get_info | check_python_dependencies
-	@echo "Partition table binary generated. Contents:"
-	@echo $(SEPARATOR)
-	$(GEN_ESP32PART) $<
-	@echo $(SEPARATOR)
-	@echo "Partition flashing command:"
-	@echo "$(PARTITION_TABLE_FLASH_CMD)"
-
-partition_table-flash: $(PARTITION_TABLE_BIN) | check_python_dependencies
-	@echo "Flashing partition table..."
-	$(PARTITION_TABLE_FLASH_CMD)
-
-partition_table-clean:
-	rm -f $(PARTITION_TABLE_BIN)
-
-clean: partition_table-clean
-
-endif
diff --git a/components/partition_table/component.mk b/components/partition_table/component.mk
deleted file mode 100644
index 2789fa4d96..0000000000
--- a/components/partition_table/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-# partition table component is special, because it doesn't contain any
-# IDF source files. It only adds steps via Makefile.projbuild &
-# Kconfig.projbuild
-COMPONENT_CONFIG_ONLY := 1
diff --git a/components/partition_table/test/component.mk b/components/partition_table/test/component.mk
deleted file mode 100644
index 5dd172bdb7..0000000000
--- a/components/partition_table/test/component.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-#Component Makefile
-#
-
-COMPONENT_ADD_LDFLAGS = -Wl,--whole-archive -l$(COMPONENT_NAME) -Wl,--no-whole-archive
diff --git a/components/perfmon/component.mk b/components/perfmon/component.mk
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/components/perfmon/test/component.mk b/components/perfmon/test/component.mk
deleted file mode 100644
index 3fa92a0763..0000000000
--- a/components/perfmon/test/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-COMPONENT_SRCDIRS := \
-                    .
-
-COMPONENT_ADD_LDFLAGS = -Wl,--whole-archive -l$(COMPONENT_NAME) -Wl,--no-whole-archive
diff --git a/components/protobuf-c/component.mk b/components/protobuf-c/component.mk
deleted file mode 100644
index a8c4900ab2..0000000000
--- a/components/protobuf-c/component.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Component Makefile
-#
-COMPONENT_ADD_INCLUDEDIRS := protobuf-c
-
-COMPONENT_SRCDIRS := protobuf-c/protobuf-c
-
-COMPONENT_SUBMODULES += protobuf-c
diff --git a/components/protocomm/component.mk b/components/protocomm/component.mk
deleted file mode 100644
index fbc0232f08..0000000000
--- a/components/protocomm/component.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-COMPONENT_ADD_INCLUDEDIRS := include/common include/security include/transports
-COMPONENT_PRIV_INCLUDEDIRS := proto-c src/common src/simple_ble
-COMPONENT_SRCDIRS := src/common src/security proto-c src/simple_ble src/transports
-
-ifndef CONFIG_BT_BLUEDROID_ENABLED
-	COMPONENT_OBJEXCLUDE += src/simple_ble/simple_ble.o src/transports/protocomm_ble.o
-endif
-
-ifndef CONFIG_BT_NIMBLE_ENABLED
-       COMPONENT_OBJEXCLUDE += src/transports/protocomm_nimble.o
-endif
diff --git a/components/protocomm/test/component.mk b/components/protocomm/test/component.mk
deleted file mode 100644
index 7a27118a0e..0000000000
--- a/components/protocomm/test/component.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-COMPONENT_PRIV_INCLUDEDIRS := ../proto-c/
-COMPONENT_ADD_LDFLAGS = -Wl,--whole-archive -l$(COMPONENT_NAME) -Wl,--no-whole-archive
diff --git a/components/pthread/component.mk b/components/pthread/component.mk
deleted file mode 100644
index 4c60b3fdcb..0000000000
--- a/components/pthread/component.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Component Makefile
-#
-
-COMPONENT_SRCDIRS := .
-
-COMPONENT_ADD_INCLUDEDIRS := include
-
-COMPONENT_ADD_LDFLAGS := -lpthread
-
-ifdef CONFIG_FREERTOS_ENABLE_STATIC_TASK_CLEAN_UP
-COMPONENT_ADD_LDFLAGS += -Wl,--wrap=vPortCleanUpTCB
-endif
-
-# Forces the linker to include pthread implementation from this component,
-# instead of the weak implementations provided by libgcc.
-COMPONENT_ADD_LDFLAGS += -u pthread_include_pthread_impl
-COMPONENT_ADD_LDFLAGS += -u pthread_include_pthread_cond_impl
-COMPONENT_ADD_LDFLAGS += -u pthread_include_pthread_local_storage_impl
-COMPONENT_ADD_LDFLAGS += -u pthread_include_pthread_rwlock_impl
-
-CFLAGS += -D_POSIX_READER_WRITER_LOCKS
diff --git a/components/pthread/test/component.mk b/components/pthread/test/component.mk
deleted file mode 100644
index af9fbb8371..0000000000
--- a/components/pthread/test/component.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-#Component Makefile
-#
-
-COMPONENT_SRCDIRS := .
-
-#CXXFLAGS += -H
-
-COMPONENT_ADD_LDFLAGS = -Wl,--whole-archive -l$(COMPONENT_NAME) -Wl,--no-whole-archive
diff --git a/components/sdmmc/component.mk b/components/sdmmc/component.mk
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/components/sdmmc/test/component.mk b/components/sdmmc/test/component.mk
deleted file mode 100644
index ce464a212a..0000000000
--- a/components/sdmmc/test/component.mk
+++ /dev/null
@@ -1 +0,0 @@
-COMPONENT_ADD_LDFLAGS = -Wl,--whole-archive -l$(COMPONENT_NAME) -Wl,--no-whole-archive
diff --git a/components/soc/component.mk b/components/soc/component.mk
deleted file mode 100644
index f2dba93ca3..0000000000
--- a/components/soc/component.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-COMPONENT_SRCDIRS := . $(IDF_TARGET)
-COMPONENT_ADD_INCLUDEDIRS := include $(IDF_TARGET) $(IDF_TARGET)/include
-
-COMPONENT_ADD_LINKER_DEPS += $(COMPONENT_PATH) esp32/ld/esp32.peripherals.ld
-COMPONENT_ADD_LDFLAGS += -T $(COMPONENT_PATH)/esp32/ld/esp32.peripherals.ld
-
-COMPONENT_ADD_LDFRAGMENTS += linker.lf
diff --git a/components/spi_flash/component.mk b/components/spi_flash/component.mk
deleted file mode 100644
index 03c92cb3a9..0000000000
--- a/components/spi_flash/component.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-COMPONENT_ADD_INCLUDEDIRS := include
-
-COMPONENT_SRCDIRS := . $(IDF_TARGET)
-COMPONENT_PRIV_INCLUDEDIRS := include/spi_flash
-
-COMPONENT_ADD_LDFRAGMENTS += linker.lf
-
-COMPONENT_OBJEXCLUDE := spi_flash_timing_tuning.o
-
-ifdef IS_BOOTLOADER_BUILD
-# Bootloader needs updated SPIUnlock from this file
-COMPONENT_OBJS := esp32/spi_flash_rom_patch.o
-endif
diff --git a/components/spi_flash/test/component.mk b/components/spi_flash/test/component.mk
deleted file mode 100644
index 2a236e9d03..0000000000
--- a/components/spi_flash/test/component.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-#Component Makefile
-#
-
-COMPONENT_ADD_LDFLAGS = -Wl,--whole-archive -l$(COMPONENT_NAME) -Wl,--no-whole-archive
-
-ifdef CONFIG_SPI_FLASH_USE_LEGACY_IMPL
-	COMPONENT_OBJEXCLUDE += test_esp_flash.o test_partition_ext.o
-endif
diff --git a/components/spiffs/Makefile.projbuild b/components/spiffs/Makefile.projbuild
deleted file mode 100644
index 331428a327..0000000000
--- a/components/spiffs/Makefile.projbuild
+++ /dev/null
@@ -1,53 +0,0 @@
-SPIFFSGEN_PY:=$(COMPONENT_PATH)/spiffsgen.py
-SPIFFSGEN_FLASH_IN_PROJECT=
-
-ifdef CONFIG_SPIFFS_USE_MAGIC
-USE_MAGIC := "--use-magic"
-else
-USE_MAGIC :=
-endif
-
-ifdef CONFIG_SPIFFS_USE_MAGIC_LENGTH
-USE_MAGIC_LEN := "--use-magic-len"
-else
-USE_MAGIC_LEN :=
-endif
-
-ifdef CONFIG_SPIFFS_FOLLOW_SYMLINKS
-FOLLOW_SYMLINKS := "--follow-symlinks"
-else
-FOLLOW_SYMLINKS :=
-endif
-
-# spiffs_create_partition_image
-#
-# Create a spiffs image of the specified directory on the host during build and optionally
-# have the created image flashed using `make flash`
-define spiffs_create_partition_image
-
-$(1)_bin: $(PARTITION_TABLE_BIN) $(SPIFFS_IMAGE_DEPENDS) | check_python_dependencies
-	partition_size=`$(GET_PART_INFO) \
-	--partition-table-file $(PARTITION_TABLE_BIN) \
-	get_partition_info --partition-name $(1) --info size`; \
-	$(PYTHON) $(SPIFFSGEN_PY) $$$$partition_size $(2) $(BUILD_DIR_BASE)/$(1).bin \
-	--page-size=$(CONFIG_SPIFFS_PAGE_SIZE) \
-	--obj-name-len=$(CONFIG_SPIFFS_OBJ_NAME_LEN) \
-	--meta-len=$(CONFIG_SPIFFS_META_LENGTH) \
-	$(FOLLOW_SYMLINKS) \
-	$(USE_MAGIC) \
-	$(USE_MAGIC_LEN)
-
-all_binaries: $(1)_bin
-print_flash_cmd: $(1)_bin
-
-# Append the created binary to esptool_py args if FLASH_IN_PROJECT is set
-ifdef SPIFFS_IMAGE_FLASH_IN_PROJECT
-ifeq ($(SPIFFS_IMAGE_FLASH_IN_PROJECT),1)
-SPIFFSGEN_FLASH_IN_PROJECT += $(1)
-endif
-endif
-endef
-
-ESPTOOL_ALL_FLASH_ARGS += $(foreach partition,$(SPIFFSGEN_FLASH_IN_PROJECT), \
-$(shell $(GET_PART_INFO) --partition-table-file $(PARTITION_TABLE_BIN) \
-get_partition_info --partition-name $(partition) --info offset) $(BUILD_DIR_BASE)/$(partition).bin)
diff --git a/components/spiffs/component.mk b/components/spiffs/component.mk
deleted file mode 100644
index 804b02bd30..0000000000
--- a/components/spiffs/component.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-COMPONENT_ADD_INCLUDEDIRS := include
-COMPONENT_PRIV_INCLUDEDIRS := . spiffs/src
-COMPONENT_SRCDIRS := . spiffs/src
-
-# To avoid warning for strncpy in "spiffs_nucleus.c"
-CPPFLAGS += -Wno-stringop-truncation
-
-COMPONENT_SUBMODULES := spiffs
diff --git a/components/spiffs/test/component.mk b/components/spiffs/test/component.mk
deleted file mode 100644
index ce464a212a..0000000000
--- a/components/spiffs/test/component.mk
+++ /dev/null
@@ -1 +0,0 @@
-COMPONENT_ADD_LDFLAGS = -Wl,--whole-archive -l$(COMPONENT_NAME) -Wl,--no-whole-archive
diff --git a/components/tcp_transport/component.mk b/components/tcp_transport/component.mk
deleted file mode 100644
index 74d4e96cd6..0000000000
--- a/components/tcp_transport/component.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-COMPONENT_ADD_INCLUDEDIRS := include
-COMPONENT_PRIV_INCLUDEDIRS := private_include
-
-ifndef CONFIG_WS_TRANSPORT
-	COMPONENT_OBJEXCLUDE := transport_ws.o
-endif
diff --git a/components/tcp_transport/test/component.mk b/components/tcp_transport/test/component.mk
deleted file mode 100644
index 009d63d124..0000000000
--- a/components/tcp_transport/test/component.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-#Component Makefile
-#
-COMPONENT_PRIV_INCLUDEDIRS := ../private_include .
-COMPONENT_ADD_LDFLAGS = -Wl,--whole-archive -l$(COMPONENT_NAME) -Wl,--no-whole-archive
diff --git a/components/tcpip_adapter/component.mk b/components/tcpip_adapter/component.mk
deleted file mode 100644
index 308f64f0ea..0000000000
--- a/components/tcpip_adapter/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# Component Makefile
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/components/touch_element/test/component.mk b/components/touch_element/test/component.mk
deleted file mode 100644
index 888b7d448c..0000000000
--- a/components/touch_element/test/component.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Component Makefile
-#
-# Touch Element lib is not supported in GNU Make build system
-COMPONENT_CONFIG_ONLY := 1
diff --git a/components/ulp/Makefile.projbuild b/components/ulp/Makefile.projbuild
deleted file mode 100644
index b8616c168a..0000000000
--- a/components/ulp/Makefile.projbuild
+++ /dev/null
@@ -1,9 +0,0 @@
-ULP_BINUTILS_PREFIX ?= esp32ulp-elf-
-#
-export ULP_AS := $(ULP_BINUTILS_PREFIX)as
-export ULP_LD := $(ULP_BINUTILS_PREFIX)ld
-export ULP_OBJCOPY := $(ULP_BINUTILS_PREFIX)objcopy
-export ULP_OBJDUMP := $(ULP_BINUTILS_PREFIX)objdump
-export ULP_LD_TEMPLATE := $(IDF_PATH)/components/ulp/ld/esp32.ulp.ld
-export ULP_NM := $(ULP_BINUTILS_PREFIX)nm
-export ULP_MAP_GEN := $(IDF_PATH)/components/ulp/esp32ulp_mapgen.py
diff --git a/components/ulp/component.mk b/components/ulp/component.mk
deleted file mode 100644
index ef4db2af12..0000000000
--- a/components/ulp/component.mk
+++ /dev/null
@@ -1 +0,0 @@
-COMPONENT_OBJEXCLUDE := ulp_riscv.o
diff --git a/components/ulp/component_ulp_common.mk b/components/ulp/component_ulp_common.mk
deleted file mode 100644
index 54eda2acbc..0000000000
--- a/components/ulp/component_ulp_common.mk
+++ /dev/null
@@ -1,112 +0,0 @@
-# Extra make rules for components containing ULP coprocessor code.
-#
-# ULP program(s) gets built and linked into the application.
-# Steps taken here are explained in docs/ulp.rst
-
-# Define names for files generated at different stages
-ULP_ELF := $(ULP_APP_NAME).elf
-ULP_MAP := $(ULP_ELF:.elf=.map)
-ULP_SYM := $(ULP_ELF:.elf=.sym)
-ULP_BIN := $(ULP_ELF:.elf=.bin)
-ULP_EXPORTS_LD := $(ULP_ELF:.elf=.ld)
-ULP_EXPORTS_HEADER := $(ULP_ELF:.elf=.h)
-ULP_LD_SCRIPT := $(ULP_ELF:.elf=.common.ld)
-
-ULP_OBJECTS := $(notdir $(ULP_S_SOURCES:.S=.ulp.o))
-ULP_DEP := $(notdir $(ULP_S_SOURCES:.S=.ulp.d)) $(ULP_LD_SCRIPT:.ld=.d)
-ULP_PREPROCESSED := $(notdir $(ULP_S_SOURCES:.S=.ulp.pS))
-ULP_LISTINGS := $(notdir $(ULP_S_SOURCES:.S=.ulp.lst))
-
-ULP_PREPROCESSOR_ARGS := \
-	$(addprefix -I ,$(COMPONENT_INCLUDES)) \
-	$(addprefix -I ,$(COMPONENT_EXTRA_INCLUDES)) \
-	-I$(COMPONENT_PATH) -D__ASSEMBLER__
-
--include $(ULP_DEP)
-
-# Check the assembler version
-include $(IDF_PATH)/components/ulp/toolchain_ulp_version.mk
-# $(ULP_AS) --version output might be localized, for example the first line could be
-# "Ensamblador (GNU Binutils) 2.28.51-esp-20191205 de GNU" instead of
-# "GNU assembler (GNU Binutils) 2.28.51-esp-20191205".
-ULP_AS_VER := $(shell $(ULP_AS) --version | sed -E -n 's/.+ \(GNU Binutils\) ([a-z0-9\.-]+)( .*)?/\1/gp')
-
-$(info Building ULP app $(ULP_APP_NAME))
-$(info ULP assembler version: $(ULP_AS_VER))
-
-ifeq (,$(findstring $(ULP_AS_VER), $(SUPPORTED_ULP_ASSEMBLER_VERSION)))
-$(info WARNING: ULP assembler version $(ULP_AS_VER) is not supported.)
-$(info Expected to see version: $(SUPPORTED_ULP_ASSEMBLER_VERSION))
-$(info Please check ESP-IDF ULP setup instructions and update the toolchain, or proceed at your own risk.)
-endif
-
-# Preprocess LD script used to link ULP program
-$(ULP_LD_SCRIPT): $(ULP_LD_TEMPLATE)
-	$(summary) CPP $(patsubst $(PWD)/%,%,$(CURDIR))/$@
-	$(CC) $(CPPFLAGS) -MT $(ULP_LD_SCRIPT) -E -P -xc -o $@ $(ULP_PREPROCESSOR_ARGS) $<
-
-# Generate preprocessed assembly files.
-# To inspect these preprocessed files, add a ".PRECIOUS: %.ulp.pS" rule.
-%.ulp.pS: $(COMPONENT_PATH)/ulp/%.S
-	$(summary) CPP $(patsubst $(PWD)/%,%,$<)
-	$(CC) $(CPPFLAGS) -MT $(patsubst %.ulp.pS,%.ulp.o,$@) -E -P -xc -o $@ $(ULP_PREPROCESSOR_ARGS) $<
-
-# Compiled preprocessed files into object files.
-%.ulp.o: %.ulp.pS
-	$(summary) ULP_AS $(patsubst $(PWD)/%,%,$(CURDIR))/$@
-	$(ULP_AS) -al=$(patsubst %.ulp.o,%.ulp.lst,$@) -o $@ $<
-
-# Link object files and generate map file
-$(ULP_ELF): $(ULP_OBJECTS) $(ULP_LD_SCRIPT)
-	$(summary) ULP_LD $(patsubst $(PWD)/%,%,$(CURDIR))/$@
-	$(ULP_LD) -o $@ -A elf32-esp32ulp -Map=$(ULP_MAP) -T $(ULP_LD_SCRIPT) $(ULP_OBJECTS)
-
-# Dump the list of global symbols in a convenient format.
-$(ULP_SYM): $(ULP_ELF)
-	$(ULP_NM) -g -f posix $< > $@
-
-# Dump the binary for inclusion into the project
-$(COMPONENT_BUILD_DIR)/$(ULP_BIN): $(ULP_ELF)
-	$(summary) ULP_BIN $(patsubst $(PWD)/%,%,$@)
-	$(ULP_OBJCOPY) -O binary $< $@
-
-# Left and right side of the rule are the same, but the right side
-# is given as an absolute path.
-# (Make can not resolve such things automatically)
-$(ULP_EXPORTS_HEADER): $(COMPONENT_BUILD_DIR)/$(ULP_EXPORTS_HEADER)
-
-# Artificial intermediate target to trigger generation of .h and .ld files.
-.INTERMEDIATE: $(COMPONENT_NAME)_ulp_mapgen_intermediate
-
-$(COMPONENT_BUILD_DIR)/$(ULP_EXPORTS_HEADER)\
-$(COMPONENT_BUILD_DIR)/$(ULP_EXPORTS_LD): $(COMPONENT_NAME)_ulp_mapgen_intermediate
-
-# Convert the symbols list into a header file and linker export script.
-$(COMPONENT_NAME)_ulp_mapgen_intermediate: $(ULP_SYM)
-	$(summary) ULP_MAPGEN $(patsubst $(PWD)/%,%,$(CURDIR))/$<
-	$(ULP_MAP_GEN) -s $(ULP_SYM) -o $(ULP_EXPORTS_LD:.ld=)
-
-# Building the component separately from the project should result in
-# ULP files being built.
-build: $(COMPONENT_BUILD_DIR)/$(ULP_EXPORTS_HEADER) \
-	$(COMPONENT_BUILD_DIR)/$(ULP_EXPORTS_LD) \
-	$(COMPONENT_BUILD_DIR)/$(ULP_BIN)
-
-# Objects listed as being dependent on $(ULP_EXPORTS_HEADER) must also
-# depend on $(ULP_SYM), to order build steps correctly.
-$(ULP_EXP_DEP_OBJECTS) : $(ULP_EXPORTS_HEADER) $(ULP_SYM)
-
-# Finally, set all the variables processed by the build system.
-COMPONENT_EXTRA_CLEAN += $(ULP_OBJECTS) \
-			$(ULP_LD_SCRIPT) \
-			$(ULP_PREPROCESSED) \
-			$(ULP_ELF) $(ULP_BIN) \
-			$(ULP_MAP) $(ULP_SYM) \
-			$(ULP_EXPORTS_LD) \
-			$(ULP_EXPORTS_HEADER) \
-			$(ULP_DEP) \
-			$(ULP_LISTINGS)
-
-COMPONENT_EMBED_FILES += $(COMPONENT_BUILD_DIR)/$(ULP_BIN)
-COMPONENT_ADD_LDFLAGS += -l$(COMPONENT_NAME) -T $(COMPONENT_BUILD_DIR)/$(ULP_EXPORTS_LD)
-COMPONENT_EXTRA_INCLUDES += $(COMPONENT_BUILD_DIR)
diff --git a/components/ulp/test/component.mk b/components/ulp/test/component.mk
deleted file mode 100644
index 7cd2406dec..0000000000
--- a/components/ulp/test/component.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-ULP_APP_NAME = ulp_test_app
-
-COMPONENT_SRCDIRS += esp32
-
-ULP_S_SOURCES = $(addprefix $(COMPONENT_PATH)/ulp/, \
-	test_jumps_esp32.S \
-	)
-
-ULP_EXP_DEP_OBJECTS := esp32/test_ulp_as.o
-
-include $(IDF_PATH)/components/ulp/component_ulp_common.mk
-
-COMPONENT_ADD_LDFLAGS += -Wl,--whole-archive -l$(COMPONENT_NAME) -Wl,--no-whole-archive
diff --git a/components/unity/Makefile.projbuild b/components/unity/Makefile.projbuild
deleted file mode 100644
index 39d01abd2b..0000000000
--- a/components/unity/Makefile.projbuild
+++ /dev/null
@@ -1 +0,0 @@
-CPPFLAGS += -DUNITY_INCLUDE_CONFIG_H
diff --git a/components/unity/component.mk b/components/unity/component.mk
deleted file mode 100644
index 1646ca5f1e..0000000000
--- a/components/unity/component.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Component Makefile
-#
-
-unity/src/unity.o: CFLAGS += -Wno-unused-const-variable
-
-COMPONENT_ADD_INCLUDEDIRS = include unity/src
-COMPONENT_SRCDIRS = unity/src .
-
-ifdef CONFIG_UNITY_ENABLE_BACKTRACE_ON_FAIL
-COMPONENT_PRIV_INCLUDEDIRS += include/priv
-endif
-
-ifndef CONFIG_UNITY_ENABLE_IDF_TEST_RUNNER
-COMPONENT_OBJEXCLUDE += unity_runner.o
-endif
-
-ifdef CONFIG_UNITY_ENABLE_FIXTURE
-COMPONENT_SRCDIRS += unity/extras/fixture/src
-COMPONENT_ADD_INCLUDEDIRS += unity/extras/fixture/src
-endif
-
-COMPONENT_SUBMODULES := unity
diff --git a/components/usb/test/component.mk b/components/usb/test/component.mk
deleted file mode 100644
index d2183390cc..0000000000
--- a/components/usb/test/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# Component Makefile (not used for tests, but CI checks test parity between GNU Make & CMake)
-#
-COMPONENT_CONFIG_ONLY := 1
diff --git a/components/vfs/component.mk b/components/vfs/component.mk
deleted file mode 100644
index d9adffb06c..0000000000
--- a/components/vfs/component.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-COMPONENT_PRIV_INCLUDEDIRS := private_include
-ifndef CONFIG_ESP_CONSOLE_USB_CDC
-    COMPONENT_OBJEXCLUDE := vfs_cdcacm.o
-endif
-ifndef CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG
-    COMPONENT_OBJEXCLUDE := vfs_usb_serial_jtag.o
-endif
diff --git a/components/vfs/test/component.mk b/components/vfs/test/component.mk
deleted file mode 100644
index ce464a212a..0000000000
--- a/components/vfs/test/component.mk
+++ /dev/null
@@ -1 +0,0 @@
-COMPONENT_ADD_LDFLAGS = -Wl,--whole-archive -l$(COMPONENT_NAME) -Wl,--no-whole-archive
diff --git a/components/wear_levelling/component.mk b/components/wear_levelling/component.mk
deleted file mode 100644
index 191e638142..0000000000
--- a/components/wear_levelling/component.mk
+++ /dev/null
@@ -1 +0,0 @@
-COMPONENT_PRIV_INCLUDEDIRS := private_include
diff --git a/components/wifi_provisioning/component.mk b/components/wifi_provisioning/component.mk
deleted file mode 100644
index a006c793ca..0000000000
--- a/components/wifi_provisioning/component.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-COMPONENT_SRCDIRS := src proto-c
-COMPONENT_ADD_INCLUDEDIRS := include
-COMPONENT_PRIV_INCLUDEDIRS := src proto-c ../protocomm/proto-c/
-
-ifndef CONFIG_BT_BLUEDROID_ENABLED
-    ifndef CONFIG_BT_NIMBLE_ENABLED
-        COMPONENT_OBJEXCLUDE := src/scheme_ble.o
-    endif
-endif
-
-ifeq ($(CONFIG_ESP_WIFI_SOFTAP_SUPPORT), y)
-    COMPONENT_OBJEXCLUDE += src/scheme_softap.o
-endif
diff --git a/components/wpa_supplicant/component.mk b/components/wpa_supplicant/component.mk
deleted file mode 100644
index 66b59170e2..0000000000
--- a/components/wpa_supplicant/component.mk
+++ /dev/null
@@ -1,103 +0,0 @@
-# supplicant make file
-
-COMPONENT_PRIV_INCLUDEDIRS := src src/utils esp_supplicant/src
-COMPONENT_SRCDIRS := port src/ap src/common src/crypto src/eap_peer src/rsn_supp src/tls src/utils src/wps esp_supplicant/src
-COMPONENT_ADD_INCLUDEDIRS := include port/include esp_supplicant/include src/utils
-
-ifeq ($(CONFIG_ESP_WIFI_SOFTAP_SUPPORT), y)
-    COMPONENT_OBJEXCLUDE += src/esp_hostap.o
-endif
-
-ifeq ($(CONFIG_WPA_MBEDTLS_CRYPTO), y)
-    COMPONENT_OBJEXCLUDE += src/tls/asn1.o \
-    src/tls/bignum.o \
-    src/tls/pkcs1.o \
-    src/tls/pkcs5.o \
-    src/tls/pkcs8.o \
-    src/tls/rsa.o \
-    src/tls/tls_internal.o \
-    src/tls/tlsv1_client.o \
-    src/tls/tlsv1_client_read.o \
-    src/tls/tlsv1_client_write.o \
-    src/tls/tlsv1_common.o \
-    src/tls/tlsv1_cred.o \
-    src/tls/tlsv1_record.o \
-    src/tls/tlsv1_server.o \
-    src/tls/tlsv1_server_read.o \
-    src/tls/tlsv1_server_write.o \
-    src/tls/x509v3.o \
-    src/crypto/aes-ctr.o \
-    src/crypto/aes-cbc.o \
-    src/crypto/aes-internal-dec.o \
-    src/crypto/aes-internal-enc.o \
-    src/crypto/aes-internal.o \
-    src/crypto/crypto_internal-cipher.o \
-    src/crypto/crypto_internal-modexp.o \
-    src/crypto/crypto_internal-rsa.o \
-    src/crypto/crypto_mbedtls-rsa.o \
-    src/crypto/crypto_internal.o \
-    src/crypto/md5-internal.o \
-    src/crypto/md5.o \
-    src/crypto/sha1-internal.o \
-    src/crypto/sha1-pbkdf2.o \
-    src/crypto/sha1.o \
-    src/crypto/sha256-internal.o \
-    src/crypto/sha256.o
-else
-    COMPONENT_OBJEXCLUDE += src/crypto/tls_mbedtls.o \
-    src/crypto/crypto_mbedtls.o \
-    src/crypto/crypto_mbedtls-bignum.o \
-    src/crypto/crypto_mbedtls-ec.o
-endif
-
-ifneq ($(CONFIG_MBEDTLS_RC4_DISABLED), y)
-    COMPONENT_OBJEXCLUDE += src/crypto/rc4.o
-endif
-ifeq ($(CONFIG_MBEDTLS_DES_C), y)
-    COMPONENT_OBJEXCLUDE += src/crypto/des-internal.o
-endif
-ifeq ($(CONFIG_MBEDTLS_CMAC_C), y)
-    COMPONENT_OBJEXCLUDE += src/crypto/aes-omac1.o
-endif
-ifeq ($(CONFIG_MBEDTLS_NIST_KW_C), y)
-    COMPONENT_OBJEXCLUDE += src/crypto/aes-wrap.o
-    COMPONENT_OBJEXCLUDE += src/crypto/aes-unwrap.o
-    COMPONENT_OBJEXCLUDE += src/crypto/aes-ccm.o
-endif
-
-ifneq ($(CONFIG_WPA_11KV_SUPPORT), y)
-    COMPONENT_OBJEXCLUDE += src/common/rrm.o \
-    src/common/wnm_sta.o \
-    src/common/bss.o \
-    src/common/scan.o \
-    src/common/ieee802_11_common.o \
-    esp_supplicant/src/esp_common.o \
-    esp_supplicant/src/esp_scan.o
-endif
-ifneq ($(CONFIG_WPA_MBO_SUPPORT), y)
-    COMPONENT_OBJEXCLUDE += src/common/mbo.o
-endif
-
-CFLAGS += -DCONFIG_SHA256 -DCONFIG_DPP -DCONFIG_IEEE80211W -DESP_SUPPLICANT -DIEEE8021X_EAPOL -DEAP_PEER_METHOD -DEAP_TLS -DEAP_TTLS -DEAP_PEAP -DEAP_MSCHAPv2 -DUSE_WPA2_TASK -DCONFIG_WPS2 -DCONFIG_WPS_PIN -DUSE_WPS_TASK -DESPRESSIF_USE -DESP32_WORKAROUND -DCONFIG_ECC -DCONFIG_WNM -D__ets__ -Wno-strict-aliasing
-
-ifdef CONFIG_ESP32_WIFI_ENABLE_WPA3_SAE
-    CFLAGS += -DCONFIG_WPA3_SAE
-endif
-ifdef CONFIG_WPA_WPS_STRICT
-	CFLAGS += -DCONFIG_WPS_STRICT
-endif
-ifdef CONFIG_WPA_MBO_SUPPORT
-	CFLAGS += -DCONFIG_MBO
-endif
-ifdef CONFIG_WPA_SUITE_B_192
-	CFLAGS += -DCONFIG_SUITEB192
-endif
-ifdef CONFIG_WPA_SUITE_B
-	CFLAGS += -DCONFIG_SUITEB
-endif
-ifdef CONFIG_ESP_WIFI_GCMP_SUPPORT
-	CFLAGS += -DCONFIG_GCMP
-endif
-ifdef CONFIG_ESP_WIFI_GMAC_SUPPORT
-	CFLAGS += -DCONFIG_GMAC
-endif
diff --git a/components/wpa_supplicant/test/component.mk b/components/wpa_supplicant/test/component.mk
deleted file mode 100644
index 9feb1cfc31..0000000000
--- a/components/wpa_supplicant/test/component.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-#Component Makefile
-#
-
-COMPONENT_PRIV_INCLUDEDIRS := ../src
-COMPONENT_SRCDIRS := .
-
-COMPONENT_ADD_LDFLAGS = -Wl,--whole-archive -l$(COMPONENT_NAME) -Wl,--no-whole-archive
-
-CFLAGS+= -DCONFIG_WPA3_SAE
-CFLAGS+= -DCONFIG_DPP
diff --git a/components/xtensa/component.mk b/components/xtensa/component.mk
deleted file mode 100644
index beaf75b312..0000000000
--- a/components/xtensa/component.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-COMPONENT_ADD_INCLUDEDIRS := include esp32/include
-
-COMPONENT_ADD_LDFLAGS += $(COMPONENT_PATH)/esp32/libxt_hal.a
-
-COMPONENT_ADD_LDFRAGMENTS += linker.lf
-
-COMPONENT_SRCDIRS := . esp32
-
-ifdef IS_BOOTLOADER_BUILD
-	COMPONENT_OBJEXCLUDE := xtensa_intr.o xtensa_intr_asm.o
-endif
diff --git a/components/xtensa/trax/test/Makefile b/components/xtensa/trax/test/Makefile
deleted file mode 100644
index c8c24904c0..0000000000
--- a/components/xtensa/trax/test/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-PROG_BIN := test.bin
-PROG_ELF := test.elf
-OBJ := test.o
-PREFIX := xtensa-esp32-elf-
-CC := $(PREFIX)gcc
-LD := $(PREFIX)ld
-GDB ?= $(PREFIX)gdb
-CFLAGS := -g -O0
-LDFLAGS := -L $(IDF_PATH)/components/bootloader/subproject/main/ld/esp32 \
-	-T bootloader.ld \
-	-u entry \
-	-e entry \
-	-g
-
-TRACE_FILE := trace_pro.bin
-GDB_LOG := gdb_log.txt
-GDB_LOG_REF := gdb_log_expected.txt
-
-all: $(PROG_BIN)
-
-$(PROG_ELF): $(OBJ)
-	$(LD) $(LDFLAGS) -o $@ $<
-
-$(PROG_BIN): $(PROG_ELF)
-	esptool.py --chip esp32 elf2image --output $@ --flash_freq 40m --flash_mode dio $<
-
-flash: $(PROG_BIN)
-	esptool.py --port $(ESPPORT) write_flash 0x1000 $(PROG_BIN)
-
-test:
-	rm -f $(TRACE_FILE)
-	$(GDB) -n --batch -x gdbinit | tee $(GDB_LOG)
-	diff $(GDB_LOG) $(GDB_LOG_REF)
-	@echo "Test pass"
-
-clean:
-	rm -f $(PROG_ELF) $(PROG_BIN) $(OBJ) $(TRACE_FILE) $(GDB_LOG)
-
-.PHONY: all clean flash test
diff --git a/examples/bluetooth/bluedroid/ble/ble_ancs/Makefile b/examples/bluetooth/bluedroid/ble/ble_ancs/Makefile
deleted file mode 100644
index a5208ef071..0000000000
--- a/examples/bluetooth/bluedroid/ble/ble_ancs/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := ble_ancs
-
-COMPONENT_ADD_INCLUDEDIRS := components/include
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/bluetooth/bluedroid/ble/ble_ancs/main/component.mk b/examples/bluetooth/bluedroid/ble/ble_ancs/main/component.mk
deleted file mode 100644
index ab30be48c7..0000000000
--- a/examples/bluetooth/bluedroid/ble/ble_ancs/main/component.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Main Makefile. This is basically the same as a component makefile.
-#
-# This Makefile should, at the very least, just include $(SDK_PATH)/make/component_common.mk. By default,
-# this will take the sources in the src/ directory, compile them and link them into
-# lib(subdirectory_name).a in the build directory. This behaviour is entirely configurable,
-# please read the ESP-IDF documents if you need to do this.
-#
diff --git a/examples/bluetooth/bluedroid/ble/ble_compatibility_test/Makefile b/examples/bluetooth/bluedroid/ble/ble_compatibility_test/Makefile
deleted file mode 100644
index 6353024e29..0000000000
--- a/examples/bluetooth/bluedroid/ble/ble_compatibility_test/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := ble_compatibility_test
-
-COMPONENT_ADD_INCLUDEDIRS := components/include
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/bluetooth/bluedroid/ble/ble_compatibility_test/main/component.mk b/examples/bluetooth/bluedroid/ble/ble_compatibility_test/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/bluetooth/bluedroid/ble/ble_compatibility_test/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/bluetooth/bluedroid/ble/ble_eddystone/Makefile b/examples/bluetooth/bluedroid/ble/ble_eddystone/Makefile
deleted file mode 100644
index d587878918..0000000000
--- a/examples/bluetooth/bluedroid/ble/ble_eddystone/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := ble_eddystone_demo
-
-COMPONENT_ADD_INCLUDEDIRS := components/include
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/bluetooth/bluedroid/ble/ble_eddystone/main/component.mk b/examples/bluetooth/bluedroid/ble/ble_eddystone/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/bluetooth/bluedroid/ble/ble_eddystone/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/bluetooth/bluedroid/ble/ble_hid_device_demo/Makefile b/examples/bluetooth/bluedroid/ble/ble_hid_device_demo/Makefile
deleted file mode 100644
index 9dba0c65b8..0000000000
--- a/examples/bluetooth/bluedroid/ble/ble_hid_device_demo/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := hidd_demos
-
-COMPONENT_ADD_INCLUDEDIRS := components/include	\
-
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/bluetooth/bluedroid/ble/ble_hid_device_demo/main/component.mk b/examples/bluetooth/bluedroid/ble/ble_hid_device_demo/main/component.mk
deleted file mode 100644
index 362a1ef771..0000000000
--- a/examples/bluetooth/bluedroid/ble/ble_hid_device_demo/main/component.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Main Makefile. This is basically the same as a component makefile.
-#
-
-hid_device_le_prf.o: CFLAGS += -Wno-unused-const-variable
diff --git a/examples/bluetooth/bluedroid/ble/ble_ibeacon/Makefile b/examples/bluetooth/bluedroid/ble/ble_ibeacon/Makefile
deleted file mode 100644
index a104adccb1..0000000000
--- a/examples/bluetooth/bluedroid/ble/ble_ibeacon/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := ble_ibeacon_demo
-
-COMPONENT_ADD_INCLUDEDIRS := components/include
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/bluetooth/bluedroid/ble/ble_ibeacon/main/component.mk b/examples/bluetooth/bluedroid/ble/ble_ibeacon/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/bluetooth/bluedroid/ble/ble_ibeacon/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/bluetooth/bluedroid/ble/ble_spp_client/Makefile b/examples/bluetooth/bluedroid/ble/ble_spp_client/Makefile
deleted file mode 100644
index 9628803c60..0000000000
--- a/examples/bluetooth/bluedroid/ble/ble_spp_client/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := spp_client_demo
-
-COMPONENT_ADD_INCLUDEDIRS := components/include
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/bluetooth/bluedroid/ble/ble_spp_client/main/component.mk b/examples/bluetooth/bluedroid/ble/ble_spp_client/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/bluetooth/bluedroid/ble/ble_spp_client/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/bluetooth/bluedroid/ble/ble_spp_server/Makefile b/examples/bluetooth/bluedroid/ble/ble_spp_server/Makefile
deleted file mode 100644
index b4b746ea13..0000000000
--- a/examples/bluetooth/bluedroid/ble/ble_spp_server/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := ble_spp_server_demo
-
-COMPONENT_ADD_INCLUDEDIRS := components/include
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/bluetooth/bluedroid/ble/ble_spp_server/main/component.mk b/examples/bluetooth/bluedroid/ble/ble_spp_server/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/bluetooth/bluedroid/ble/ble_spp_server/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/bluetooth/bluedroid/ble/ble_throughput/throughput_client/Makefile b/examples/bluetooth/bluedroid/ble/ble_throughput/throughput_client/Makefile
deleted file mode 100644
index b08f8da825..0000000000
--- a/examples/bluetooth/bluedroid/ble/ble_throughput/throughput_client/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := throughput_client_demo
-
-COMPONENT_ADD_INCLUDEDIRS := components/include
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/bluetooth/bluedroid/ble/ble_throughput/throughput_client/main/component.mk b/examples/bluetooth/bluedroid/ble/ble_throughput/throughput_client/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/bluetooth/bluedroid/ble/ble_throughput/throughput_client/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/bluetooth/bluedroid/ble/ble_throughput/throughput_server/Makefile b/examples/bluetooth/bluedroid/ble/ble_throughput/throughput_server/Makefile
deleted file mode 100644
index 66f62011a0..0000000000
--- a/examples/bluetooth/bluedroid/ble/ble_throughput/throughput_server/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := throughput_server_demo
-
-COMPONENT_ADD_INCLUDEDIRS := components/include
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/bluetooth/bluedroid/ble/ble_throughput/throughput_server/main/component.mk b/examples/bluetooth/bluedroid/ble/ble_throughput/throughput_server/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/bluetooth/bluedroid/ble/ble_throughput/throughput_server/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/bluetooth/bluedroid/ble/gatt_client/Makefile b/examples/bluetooth/bluedroid/ble/gatt_client/Makefile
deleted file mode 100644
index 700ffd7add..0000000000
--- a/examples/bluetooth/bluedroid/ble/gatt_client/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := gatt_client_demo
-
-COMPONENT_ADD_INCLUDEDIRS := components/include
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/bluetooth/bluedroid/ble/gatt_client/main/component.mk b/examples/bluetooth/bluedroid/ble/gatt_client/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/bluetooth/bluedroid/ble/gatt_client/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/bluetooth/bluedroid/ble/gatt_security_client/Makefile b/examples/bluetooth/bluedroid/ble/gatt_security_client/Makefile
deleted file mode 100644
index 551e25a044..0000000000
--- a/examples/bluetooth/bluedroid/ble/gatt_security_client/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := sec_gattc_demo
-
-COMPONENT_ADD_INCLUDEDIRS := components/include
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/bluetooth/bluedroid/ble/gatt_security_client/main/component.mk b/examples/bluetooth/bluedroid/ble/gatt_security_client/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/bluetooth/bluedroid/ble/gatt_security_client/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/bluetooth/bluedroid/ble/gatt_security_server/Makefile b/examples/bluetooth/bluedroid/ble/gatt_security_server/Makefile
deleted file mode 100644
index bb3f8e072f..0000000000
--- a/examples/bluetooth/bluedroid/ble/gatt_security_server/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := sec_gatts_demo
-
-COMPONENT_ADD_INCLUDEDIRS := components/include
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/bluetooth/bluedroid/ble/gatt_security_server/main/component.mk b/examples/bluetooth/bluedroid/ble/gatt_security_server/main/component.mk
deleted file mode 100644
index ab30be48c7..0000000000
--- a/examples/bluetooth/bluedroid/ble/gatt_security_server/main/component.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Main Makefile. This is basically the same as a component makefile.
-#
-# This Makefile should, at the very least, just include $(SDK_PATH)/make/component_common.mk. By default,
-# this will take the sources in the src/ directory, compile them and link them into
-# lib(subdirectory_name).a in the build directory. This behaviour is entirely configurable,
-# please read the ESP-IDF documents if you need to do this.
-#
diff --git a/examples/bluetooth/bluedroid/ble/gatt_server/Makefile b/examples/bluetooth/bluedroid/ble/gatt_server/Makefile
deleted file mode 100644
index 2f76e60b60..0000000000
--- a/examples/bluetooth/bluedroid/ble/gatt_server/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := gatt_server_demos
-
-COMPONENT_ADD_INCLUDEDIRS := components/include
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/bluetooth/bluedroid/ble/gatt_server/main/component.mk b/examples/bluetooth/bluedroid/ble/gatt_server/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/bluetooth/bluedroid/ble/gatt_server/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/bluetooth/bluedroid/ble/gatt_server_service_table/Makefile b/examples/bluetooth/bluedroid/ble/gatt_server_service_table/Makefile
deleted file mode 100644
index 1429333348..0000000000
--- a/examples/bluetooth/bluedroid/ble/gatt_server_service_table/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := gatt_server_service_table_demo
-
-COMPONENT_ADD_INCLUDEDIRS := components/include
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/bluetooth/bluedroid/ble/gatt_server_service_table/main/component.mk b/examples/bluetooth/bluedroid/ble/gatt_server_service_table/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/bluetooth/bluedroid/ble/gatt_server_service_table/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/bluetooth/bluedroid/ble/gattc_multi_connect/Makefile b/examples/bluetooth/bluedroid/ble/gattc_multi_connect/Makefile
deleted file mode 100644
index 512ac32980..0000000000
--- a/examples/bluetooth/bluedroid/ble/gattc_multi_connect/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := gatt_multi_connect
-
-COMPONENT_ADD_INCLUDEDIRS := components/include
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/bluetooth/bluedroid/ble/gattc_multi_connect/main/component.mk b/examples/bluetooth/bluedroid/ble/gattc_multi_connect/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/bluetooth/bluedroid/ble/gattc_multi_connect/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/bluetooth/bluedroid/classic_bt/a2dp_sink/Makefile b/examples/bluetooth/bluedroid/classic_bt/a2dp_sink/Makefile
deleted file mode 100644
index eb53ecc8e7..0000000000
--- a/examples/bluetooth/bluedroid/classic_bt/a2dp_sink/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := a2dp_sink
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/bluetooth/bluedroid/classic_bt/a2dp_sink/main/component.mk b/examples/bluetooth/bluedroid/classic_bt/a2dp_sink/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/bluetooth/bluedroid/classic_bt/a2dp_sink/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/bluetooth/bluedroid/classic_bt/a2dp_source/Makefile b/examples/bluetooth/bluedroid/classic_bt/a2dp_source/Makefile
deleted file mode 100644
index ced08806b4..0000000000
--- a/examples/bluetooth/bluedroid/classic_bt/a2dp_source/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := a2dp_source
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/bluetooth/bluedroid/classic_bt/a2dp_source/main/component.mk b/examples/bluetooth/bluedroid/classic_bt/a2dp_source/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/bluetooth/bluedroid/classic_bt/a2dp_source/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/bluetooth/bluedroid/classic_bt/bt_discovery/Makefile b/examples/bluetooth/bluedroid/classic_bt/bt_discovery/Makefile
deleted file mode 100644
index 7504cfad69..0000000000
--- a/examples/bluetooth/bluedroid/classic_bt/bt_discovery/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := bt_discovery
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/bluetooth/bluedroid/classic_bt/bt_discovery/main/component.mk b/examples/bluetooth/bluedroid/classic_bt/bt_discovery/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/bluetooth/bluedroid/classic_bt/bt_discovery/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/bluetooth/bluedroid/classic_bt/bt_hid_mouse_device/Makefile b/examples/bluetooth/bluedroid/classic_bt/bt_hid_mouse_device/Makefile
deleted file mode 100644
index 9f94f135ec..0000000000
--- a/examples/bluetooth/bluedroid/classic_bt/bt_hid_mouse_device/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := bt_hid_mouse_device
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/bluetooth/bluedroid/classic_bt/bt_hid_mouse_device/main/component.mk b/examples/bluetooth/bluedroid/classic_bt/bt_hid_mouse_device/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/bluetooth/bluedroid/classic_bt/bt_hid_mouse_device/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/bluetooth/bluedroid/classic_bt/bt_spp_acceptor/Makefile b/examples/bluetooth/bluedroid/classic_bt/bt_spp_acceptor/Makefile
deleted file mode 100644
index a2666a75a1..0000000000
--- a/examples/bluetooth/bluedroid/classic_bt/bt_spp_acceptor/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := bt_spp_acceptor_demo
-
-COMPONENT_ADD_INCLUDEDIRS := components/include
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/bluetooth/bluedroid/classic_bt/bt_spp_acceptor/main/component.mk b/examples/bluetooth/bluedroid/classic_bt/bt_spp_acceptor/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/bluetooth/bluedroid/classic_bt/bt_spp_acceptor/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/bluetooth/bluedroid/classic_bt/bt_spp_initiator/Makefile b/examples/bluetooth/bluedroid/classic_bt/bt_spp_initiator/Makefile
deleted file mode 100644
index d8630415f7..0000000000
--- a/examples/bluetooth/bluedroid/classic_bt/bt_spp_initiator/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := bt_spp_initiator_demo
-
-COMPONENT_ADD_INCLUDEDIRS := components/include
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/bluetooth/bluedroid/classic_bt/bt_spp_initiator/main/component.mk b/examples/bluetooth/bluedroid/classic_bt/bt_spp_initiator/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/bluetooth/bluedroid/classic_bt/bt_spp_initiator/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/bluetooth/bluedroid/classic_bt/bt_spp_vfs_acceptor/Makefile b/examples/bluetooth/bluedroid/classic_bt/bt_spp_vfs_acceptor/Makefile
deleted file mode 100644
index ea7d1e83b0..0000000000
--- a/examples/bluetooth/bluedroid/classic_bt/bt_spp_vfs_acceptor/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := bt_spp_vfs_acceptor_demo
-
-COMPONENT_ADD_INCLUDEDIRS := components/include
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/bluetooth/bluedroid/classic_bt/bt_spp_vfs_acceptor/main/component.mk b/examples/bluetooth/bluedroid/classic_bt/bt_spp_vfs_acceptor/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/bluetooth/bluedroid/classic_bt/bt_spp_vfs_acceptor/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/bluetooth/bluedroid/classic_bt/bt_spp_vfs_initiator/Makefile b/examples/bluetooth/bluedroid/classic_bt/bt_spp_vfs_initiator/Makefile
deleted file mode 100644
index d0817d8fd3..0000000000
--- a/examples/bluetooth/bluedroid/classic_bt/bt_spp_vfs_initiator/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := bt_spp_vfs_initiator_demo
-
-COMPONENT_ADD_INCLUDEDIRS := components/include
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/bluetooth/bluedroid/classic_bt/bt_spp_vfs_initiator/main/component.mk b/examples/bluetooth/bluedroid/classic_bt/bt_spp_vfs_initiator/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/bluetooth/bluedroid/classic_bt/bt_spp_vfs_initiator/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/bluetooth/bluedroid/classic_bt/hfp_ag/Makefile b/examples/bluetooth/bluedroid/classic_bt/hfp_ag/Makefile
deleted file mode 100644
index 7615e4f705..0000000000
--- a/examples/bluetooth/bluedroid/classic_bt/hfp_ag/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := hfp_ag
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/bluetooth/bluedroid/classic_bt/hfp_ag/main/component.mk b/examples/bluetooth/bluedroid/classic_bt/hfp_ag/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/bluetooth/bluedroid/classic_bt/hfp_ag/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/bluetooth/bluedroid/classic_bt/hfp_hf/Makefile b/examples/bluetooth/bluedroid/classic_bt/hfp_hf/Makefile
deleted file mode 100644
index e1697d0f23..0000000000
--- a/examples/bluetooth/bluedroid/classic_bt/hfp_hf/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := hfp_hf
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/bluetooth/bluedroid/classic_bt/hfp_hf/main/component.mk b/examples/bluetooth/bluedroid/classic_bt/hfp_hf/main/component.mk
deleted file mode 100644
index 96aff69d29..0000000000
--- a/examples/bluetooth/bluedroid/classic_bt/hfp_hf/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding include to include path.)
diff --git a/examples/bluetooth/bluedroid/coex/a2dp_gatts_coex/Makefile b/examples/bluetooth/bluedroid/coex/a2dp_gatts_coex/Makefile
deleted file mode 100644
index 295e640477..0000000000
--- a/examples/bluetooth/bluedroid/coex/a2dp_gatts_coex/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := bt_ble_coex
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/bluetooth/bluedroid/coex/a2dp_gatts_coex/main/component.mk b/examples/bluetooth/bluedroid/coex/a2dp_gatts_coex/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/bluetooth/bluedroid/coex/a2dp_gatts_coex/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/bluetooth/bluedroid/coex/gattc_gatts_coex/Makefile b/examples/bluetooth/bluedroid/coex/gattc_gatts_coex/Makefile
deleted file mode 100644
index e8b511866a..0000000000
--- a/examples/bluetooth/bluedroid/coex/gattc_gatts_coex/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := gattc_gatts_coex
-
-COMPONENT_ADD_INCLUDEDIRS := components/include
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/bluetooth/bluedroid/coex/gattc_gatts_coex/main/component.mk b/examples/bluetooth/bluedroid/coex/gattc_gatts_coex/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/bluetooth/bluedroid/coex/gattc_gatts_coex/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/bluetooth/blufi/Makefile b/examples/bluetooth/blufi/Makefile
deleted file mode 100644
index 9c80f26c1a..0000000000
--- a/examples/bluetooth/blufi/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := blufi_demo
-
-COMPONENT_ADD_INCLUDEDIRS := components/include
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/bluetooth/blufi/main/component.mk b/examples/bluetooth/blufi/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/bluetooth/blufi/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/bluetooth/esp_ble_mesh/aligenie_demo/Makefile b/examples/bluetooth/esp_ble_mesh/aligenie_demo/Makefile
deleted file mode 100644
index 0fb79cde2c..0000000000
--- a/examples/bluetooth/esp_ble_mesh/aligenie_demo/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := aligenie_demo
-
-EXTRA_COMPONENT_DIRS := $(IDF_PATH)/examples/bluetooth/esp_ble_mesh/common_components/button
-EXTRA_COMPONENT_DIRS += $(IDF_PATH)/examples/bluetooth/esp_ble_mesh/common_components/light_driver
-EXTRA_COMPONENT_DIRS += $(IDF_PATH)/examples/bluetooth/esp_ble_mesh/common_components/example_init
-EXTRA_COMPONENT_DIRS += $(IDF_PATH)/examples/bluetooth/esp_ble_mesh/common_components/example_nvs
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/bluetooth/esp_ble_mesh/aligenie_demo/components/vendor_model/component.mk b/examples/bluetooth/esp_ble_mesh/aligenie_demo/components/vendor_model/component.mk
deleted file mode 100644
index ebd7a7d59b..0000000000
--- a/examples/bluetooth/esp_ble_mesh/aligenie_demo/components/vendor_model/component.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-#
-# Component Makefile
-#
diff --git a/examples/bluetooth/esp_ble_mesh/aligenie_demo/main/component.mk b/examples/bluetooth/esp_ble_mesh/aligenie_demo/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/bluetooth/esp_ble_mesh/aligenie_demo/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_coex_test/Makefile b/examples/bluetooth/esp_ble_mesh/ble_mesh_coex_test/Makefile
deleted file mode 100644
index 9e4e00a3cd..0000000000
--- a/examples/bluetooth/esp_ble_mesh/ble_mesh_coex_test/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := ble_mesh_coex_test
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_coex_test/components/case/component.mk b/examples/bluetooth/esp_ble_mesh/ble_mesh_coex_test/components/case/component.mk
deleted file mode 100644
index f2fef2fee4..0000000000
--- a/examples/bluetooth/esp_ble_mesh/ble_mesh_coex_test/components/case/component.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Component Makefile
-#
-
-COMPONENT_SRCDIRS := .
-
-COMPONENT_ADD_INCLUDEDIRS = .
diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_coex_test/main/component.mk b/examples/bluetooth/esp_ble_mesh/ble_mesh_coex_test/main/component.mk
deleted file mode 100644
index 513091d975..0000000000
--- a/examples/bluetooth/esp_ble_mesh/ble_mesh_coex_test/main/component.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
-#
diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_console/Makefile b/examples/bluetooth/esp_ble_mesh/ble_mesh_console/Makefile
deleted file mode 100644
index 83793caf8d..0000000000
--- a/examples/bluetooth/esp_ble_mesh/ble_mesh_console/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := ble_mesh_console
-
-COMPONENT_ADD_INCLUDEDIRS := components/include
-
-EXTRA_COMPONENT_DIRS := $(IDF_PATH)/examples/bluetooth/esp_ble_mesh/common_components/example_init
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_console/main/component.mk b/examples/bluetooth/esp_ble_mesh/ble_mesh_console/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/bluetooth/esp_ble_mesh/ble_mesh_console/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/fast_prov_client/Makefile b/examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/fast_prov_client/Makefile
deleted file mode 100644
index 2f6e19a273..0000000000
--- a/examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/fast_prov_client/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := fast_prov_client
-
-EXTRA_COMPONENT_DIRS := $(IDF_PATH)/examples/bluetooth/esp_ble_mesh/common_components/example_init \
-                        $(IDF_PATH)/examples/bluetooth/esp_ble_mesh/common_components/fast_provisioning
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/fast_prov_client/main/component.mk b/examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/fast_prov_client/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/fast_prov_client/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/fast_prov_server/Makefile b/examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/fast_prov_server/Makefile
deleted file mode 100644
index d34eb4ba02..0000000000
--- a/examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/fast_prov_server/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := fast_prov_server
-
-EXTRA_COMPONENT_DIRS := $(IDF_PATH)/examples/bluetooth/esp_ble_mesh/common_components/example_init \
-                        $(IDF_PATH)/examples/bluetooth/esp_ble_mesh/common_components/fast_provisioning
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/fast_prov_server/main/component.mk b/examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/fast_prov_server/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/fast_prov_server/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_client/Makefile b/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_client/Makefile
deleted file mode 100644
index 6c70afc114..0000000000
--- a/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_client/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := onoff_client
-
-EXTRA_COMPONENT_DIRS := $(IDF_PATH)/examples/bluetooth/esp_ble_mesh/common_components/button \
-                        $(IDF_PATH)/examples/bluetooth/esp_ble_mesh/common_components/example_init \
-                        $(IDF_PATH)/examples/bluetooth/esp_ble_mesh/common_components/example_nvs
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_client/main/component.mk b/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_client/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_client/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_server/Makefile b/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_server/Makefile
deleted file mode 100644
index f634bf00de..0000000000
--- a/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_server/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := onoff_server
-
-EXTRA_COMPONENT_DIRS := $(IDF_PATH)/examples/bluetooth/esp_ble_mesh/common_components/example_init
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_server/main/component.mk b/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_server/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_server/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_provisioner/Makefile b/examples/bluetooth/esp_ble_mesh/ble_mesh_provisioner/Makefile
deleted file mode 100644
index 3f05e87745..0000000000
--- a/examples/bluetooth/esp_ble_mesh/ble_mesh_provisioner/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := ble_mesh_provisioner
-
-EXTRA_COMPONENT_DIRS := $(IDF_PATH)/examples/bluetooth/esp_ble_mesh/common_components/example_init
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_provisioner/main/component.mk b/examples/bluetooth/esp_ble_mesh/ble_mesh_provisioner/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/bluetooth/esp_ble_mesh/ble_mesh_provisioner/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_sensor_model/sensor_client/Makefile b/examples/bluetooth/esp_ble_mesh/ble_mesh_sensor_model/sensor_client/Makefile
deleted file mode 100644
index db462c9965..0000000000
--- a/examples/bluetooth/esp_ble_mesh/ble_mesh_sensor_model/sensor_client/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := sensor_client
-
-EXTRA_COMPONENT_DIRS := $(IDF_PATH)/examples/bluetooth/esp_ble_mesh/common_components/button \
-                        $(IDF_PATH)/examples/bluetooth/esp_ble_mesh/common_components/example_init
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_sensor_model/sensor_client/main/component.mk b/examples/bluetooth/esp_ble_mesh/ble_mesh_sensor_model/sensor_client/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/bluetooth/esp_ble_mesh/ble_mesh_sensor_model/sensor_client/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_sensor_model/sensor_server/Makefile b/examples/bluetooth/esp_ble_mesh/ble_mesh_sensor_model/sensor_server/Makefile
deleted file mode 100644
index 9b59f815b0..0000000000
--- a/examples/bluetooth/esp_ble_mesh/ble_mesh_sensor_model/sensor_server/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := sensor_server
-
-EXTRA_COMPONENT_DIRS := $(IDF_PATH)/examples/bluetooth/esp_ble_mesh/common_components/example_init
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_sensor_model/sensor_server/main/component.mk b/examples/bluetooth/esp_ble_mesh/ble_mesh_sensor_model/sensor_server/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/bluetooth/esp_ble_mesh/ble_mesh_sensor_model/sensor_server/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_model/vendor_client/Makefile b/examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_model/vendor_client/Makefile
deleted file mode 100644
index 8643e5a196..0000000000
--- a/examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_model/vendor_client/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := vendor_client
-
-EXTRA_COMPONENT_DIRS := $(IDF_PATH)/examples/bluetooth/esp_ble_mesh/common_components/button \
-                        $(IDF_PATH)/examples/bluetooth/esp_ble_mesh/common_components/example_init \
-                        $(IDF_PATH)/examples/bluetooth/esp_ble_mesh/common_components/example_nvs
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_model/vendor_client/main/component.mk b/examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_model/vendor_client/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_model/vendor_client/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_model/vendor_server/Makefile b/examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_model/vendor_server/Makefile
deleted file mode 100644
index 67153c5792..0000000000
--- a/examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_model/vendor_server/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := vendor_server
-
-EXTRA_COMPONENT_DIRS := $(IDF_PATH)/examples/bluetooth/esp_ble_mesh/common_components/example_init
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_model/vendor_server/main/component.mk b/examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_model/vendor_server/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_model/vendor_server/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_wifi_coexist/Makefile b/examples/bluetooth/esp_ble_mesh/ble_mesh_wifi_coexist/Makefile
deleted file mode 100644
index be8bfd0821..0000000000
--- a/examples/bluetooth/esp_ble_mesh/ble_mesh_wifi_coexist/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := ble_mesh_wifi_coexist
-
-EXTRA_COMPONENT_DIRS := $(IDF_PATH)/examples/bluetooth/esp_ble_mesh/common_components/example_init
-EXTRA_COMPONENT_DIRS += $(IDF_PATH)/examples/bluetooth/esp_ble_mesh/common_components/fast_provisioning
-EXTRA_COMPONENT_DIRS += $(IDF_PATH)/examples/common_components/iperf
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_wifi_coexist/main/component.mk b/examples/bluetooth/esp_ble_mesh/ble_mesh_wifi_coexist/main/component.mk
deleted file mode 100644
index 513091d975..0000000000
--- a/examples/bluetooth/esp_ble_mesh/ble_mesh_wifi_coexist/main/component.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
-#
diff --git a/examples/bluetooth/esp_ble_mesh/common_components/button/component.mk b/examples/bluetooth/esp_ble_mesh/common_components/button/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/bluetooth/esp_ble_mesh/common_components/button/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/bluetooth/esp_ble_mesh/common_components/example_init/component.mk b/examples/bluetooth/esp_ble_mesh/common_components/example_init/component.mk
deleted file mode 100644
index c7c5a4e99e..0000000000
--- a/examples/bluetooth/esp_ble_mesh/common_components/example_init/component.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
-#
-COMPONENT_ADD_INCLUDEDIRS := .
diff --git a/examples/bluetooth/esp_ble_mesh/common_components/example_nvs/component.mk b/examples/bluetooth/esp_ble_mesh/common_components/example_nvs/component.mk
deleted file mode 100644
index c7c5a4e99e..0000000000
--- a/examples/bluetooth/esp_ble_mesh/common_components/example_nvs/component.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
-#
-COMPONENT_ADD_INCLUDEDIRS := .
diff --git a/examples/bluetooth/esp_ble_mesh/common_components/fast_provisioning/component.mk b/examples/bluetooth/esp_ble_mesh/common_components/fast_provisioning/component.mk
deleted file mode 100644
index c7c5a4e99e..0000000000
--- a/examples/bluetooth/esp_ble_mesh/common_components/fast_provisioning/component.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
-#
-COMPONENT_ADD_INCLUDEDIRS := .
diff --git a/examples/bluetooth/esp_ble_mesh/common_components/light_driver/component.mk b/examples/bluetooth/esp_ble_mesh/common_components/light_driver/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/bluetooth/esp_ble_mesh/common_components/light_driver/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/bluetooth/esp_hid_device/Makefile b/examples/bluetooth/esp_hid_device/Makefile
deleted file mode 100644
index 4b667be8ca..0000000000
--- a/examples/bluetooth/esp_hid_device/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := esp_hid_device
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/bluetooth/esp_hid_device/main/component.mk b/examples/bluetooth/esp_hid_device/main/component.mk
deleted file mode 100644
index 44bd2b5273..0000000000
--- a/examples/bluetooth/esp_hid_device/main/component.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-#
-# Main Makefile. This is basically the same as a component makefile.
-#
diff --git a/examples/bluetooth/esp_hid_host/Makefile b/examples/bluetooth/esp_hid_host/Makefile
deleted file mode 100644
index d012327d4c..0000000000
--- a/examples/bluetooth/esp_hid_host/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := esp_hid_host
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/bluetooth/esp_hid_host/main/component.mk b/examples/bluetooth/esp_hid_host/main/component.mk
deleted file mode 100644
index 44bd2b5273..0000000000
--- a/examples/bluetooth/esp_hid_host/main/component.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-#
-# Main Makefile. This is basically the same as a component makefile.
-#
diff --git a/examples/bluetooth/hci/ble_adv_scan_combined/Makefile b/examples/bluetooth/hci/ble_adv_scan_combined/Makefile
deleted file mode 100644
index 6da01365d7..0000000000
--- a/examples/bluetooth/hci/ble_adv_scan_combined/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := ble_adv_scan
-
-EXTRA_COMPONENT_DIRS = $(IDF_PATH)/examples/bluetooth/hci/hci_common_component
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/bluetooth/hci/ble_adv_scan_combined/main/component.mk b/examples/bluetooth/hci/ble_adv_scan_combined/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/bluetooth/hci/ble_adv_scan_combined/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/bluetooth/hci/controller_hci_uart_esp32/Makefile b/examples/bluetooth/hci/controller_hci_uart_esp32/Makefile
deleted file mode 100644
index 0773931993..0000000000
--- a/examples/bluetooth/hci/controller_hci_uart_esp32/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := controller_hci_uart
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/bluetooth/hci/controller_hci_uart_esp32/main/component.mk b/examples/bluetooth/hci/controller_hci_uart_esp32/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/bluetooth/hci/controller_hci_uart_esp32/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/bluetooth/hci/controller_vhci_ble_adv/Makefile b/examples/bluetooth/hci/controller_vhci_ble_adv/Makefile
deleted file mode 100644
index 03317f7da4..0000000000
--- a/examples/bluetooth/hci/controller_vhci_ble_adv/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := ble_adv
-
-EXTRA_COMPONENT_DIRS = $(IDF_PATH)/examples/bluetooth/hci/hci_common_component
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/bluetooth/hci/controller_vhci_ble_adv/main/component.mk b/examples/bluetooth/hci/controller_vhci_ble_adv/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/bluetooth/hci/controller_vhci_ble_adv/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/bluetooth/hci/hci_common_component/component.mk b/examples/bluetooth/hci/hci_common_component/component.mk
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/examples/bluetooth/nimble/blecent/Makefile b/examples/bluetooth/nimble/blecent/Makefile
deleted file mode 100644
index 2b3a9fe81d..0000000000
--- a/examples/bluetooth/nimble/blecent/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := blecent
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/bluetooth/nimble/blecent/main/component.mk b/examples/bluetooth/nimble/blecent/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/bluetooth/nimble/blecent/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/bluetooth/nimble/blehr/Makefile b/examples/bluetooth/nimble/blehr/Makefile
deleted file mode 100644
index 85522df5e6..0000000000
--- a/examples/bluetooth/nimble/blehr/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := blehr
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/bluetooth/nimble/blehr/main/component.mk b/examples/bluetooth/nimble/blehr/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/bluetooth/nimble/blehr/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/bluetooth/nimble/blemesh/Makefile b/examples/bluetooth/nimble/blemesh/Makefile
deleted file mode 100644
index 720983f4d2..0000000000
--- a/examples/bluetooth/nimble/blemesh/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := blemesh
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/bluetooth/nimble/blemesh/main/component.mk b/examples/bluetooth/nimble/blemesh/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/bluetooth/nimble/blemesh/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/bluetooth/nimble/bleprph/Makefile b/examples/bluetooth/nimble/bleprph/Makefile
deleted file mode 100644
index ef67465164..0000000000
--- a/examples/bluetooth/nimble/bleprph/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := bleprph
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/bluetooth/nimble/bleprph/main/component.mk b/examples/bluetooth/nimble/bleprph/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/bluetooth/nimble/bleprph/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/bluetooth/nimble/bleprph_wifi_coex/Makefile b/examples/bluetooth/nimble/bleprph_wifi_coex/Makefile
deleted file mode 100644
index aa79c71963..0000000000
--- a/examples/bluetooth/nimble/bleprph_wifi_coex/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := bleprph_wifi_coex
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/bluetooth/nimble/bleprph_wifi_coex/main/component.mk b/examples/bluetooth/nimble/bleprph_wifi_coex/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/bluetooth/nimble/bleprph_wifi_coex/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/common_components/iperf/component.mk b/examples/common_components/iperf/component.mk
deleted file mode 100644
index a77d5a2f74..0000000000
--- a/examples/common_components/iperf/component.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# Component Makefile
-#
-# This Makefile should, at the very least, just include $(SDK_PATH)/Makefile. By default,
-# this will take the sources in the src/ directory, compile them and link them into
-# lib(subdirectory_name).a in the build directory. This behaviour is entirely configurable,
-# please read the SDK documents if you need to do this.
-#
-
-#include $(IDF_PATH)/make/component_common.mk
-COMPONENT_ADD_INCLUDEDIRS := include
diff --git a/examples/common_components/led_strip/component.mk b/examples/common_components/led_strip/component.mk
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/examples/common_components/pcap/component.mk b/examples/common_components/pcap/component.mk
deleted file mode 100644
index d1c2af0183..0000000000
--- a/examples/common_components/pcap/component.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Component Makefile
-#
-COMPONENT_ADD_INCLUDEDIRS := include
-COMPONENT_SRCDIRS := src
diff --git a/examples/common_components/pid_ctrl/component.mk b/examples/common_components/pid_ctrl/component.mk
deleted file mode 100644
index 33f4c6039d..0000000000
--- a/examples/common_components/pid_ctrl/component.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-COMPONENT_ADD_INCLUDEDIRS := include
-COMPONENT_SRCDIRS := src
diff --git a/examples/common_components/protocol_examples_common/component.mk b/examples/common_components/protocol_examples_common/component.mk
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/examples/common_components/qrcode/component.mk b/examples/common_components/qrcode/component.mk
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/examples/custom_bootloader/bootloader_hooks/Makefile b/examples/custom_bootloader/bootloader_hooks/Makefile
deleted file mode 100644
index fe90b964fa..0000000000
--- a/examples/custom_bootloader/bootloader_hooks/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides
-# in is a project subdirectory.
-#
-
-PROJECT_NAME := bootloader_hooks
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/custom_bootloader/bootloader_hooks/main/component.mk b/examples/custom_bootloader/bootloader_hooks/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/custom_bootloader/bootloader_hooks/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/custom_bootloader/bootloader_override/Makefile b/examples/custom_bootloader/bootloader_override/Makefile
deleted file mode 100644
index be631acfba..0000000000
--- a/examples/custom_bootloader/bootloader_override/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := bootloader_override
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/custom_bootloader/bootloader_override/main/component.mk b/examples/custom_bootloader/bootloader_override/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/custom_bootloader/bootloader_override/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/cxx/exceptions/Makefile b/examples/cxx/exceptions/Makefile
deleted file mode 100644
index a1a246a244..0000000000
--- a/examples/cxx/exceptions/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := cpp_exceptions_example
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/cxx/exceptions/main/component.mk b/examples/cxx/exceptions/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/cxx/exceptions/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/cxx/experimental/esp_event_async_cxx/Makefile b/examples/cxx/experimental/esp_event_async_cxx/Makefile
deleted file mode 100644
index eb641cae8e..0000000000
--- a/examples/cxx/experimental/esp_event_async_cxx/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := esp_event_async_cxx
-
-EXTRA_COMPONENT_DIRS = $(IDF_PATH)/examples/cxx/experimental/experimental_cpp_component
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/cxx/experimental/esp_event_async_cxx/main/component.mk b/examples/cxx/experimental/esp_event_async_cxx/main/component.mk
deleted file mode 100644
index 0adf45649a..0000000000
--- a/examples/cxx/experimental/esp_event_async_cxx/main/component.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Main component makefile.
-#
-# This Makefile can be left empty. By default, it will take the sources in the
-# src/ directory, compile them and link them into lib(subdirectory_name).a
-# in the build directory. This behaviour is entirely configurable,
-# please read the ESP-IDF documents if you need to do this.
-#
diff --git a/examples/cxx/experimental/esp_event_cxx/Makefile b/examples/cxx/experimental/esp_event_cxx/Makefile
deleted file mode 100644
index 61ae7f1524..0000000000
--- a/examples/cxx/experimental/esp_event_cxx/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := esp_event_cxx
-
-EXTRA_COMPONENT_DIRS = $(IDF_PATH)/examples/cxx/experimental/experimental_cpp_component
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/cxx/experimental/esp_event_cxx/main/component.mk b/examples/cxx/experimental/esp_event_cxx/main/component.mk
deleted file mode 100644
index 0adf45649a..0000000000
--- a/examples/cxx/experimental/esp_event_cxx/main/component.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Main component makefile.
-#
-# This Makefile can be left empty. By default, it will take the sources in the
-# src/ directory, compile them and link them into lib(subdirectory_name).a
-# in the build directory. This behaviour is entirely configurable,
-# please read the ESP-IDF documents if you need to do this.
-#
diff --git a/examples/cxx/experimental/esp_mqtt_cxx/components/esp_mqtt_cxx/component.mk b/examples/cxx/experimental/esp_mqtt_cxx/components/esp_mqtt_cxx/component.mk
deleted file mode 100644
index 9e4987ab4e..0000000000
--- a/examples/cxx/experimental/esp_mqtt_cxx/components/esp_mqtt_cxx/component.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-COMPONENT_ADD_INCLUDEDIRS := include
-
-COMPONENT_SRCDIRS := ./
-
-CXXFLAGS += -std=gnu++17
diff --git a/examples/cxx/experimental/esp_mqtt_cxx/ssl/Makefile b/examples/cxx/experimental/esp_mqtt_cxx/ssl/Makefile
deleted file mode 100644
index 392ad4a333..0000000000
--- a/examples/cxx/experimental/esp_mqtt_cxx/ssl/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-PROJECT_NAME := mqtt_tcp_cxx
-
-EXTRA_COMPONENT_DIRS := $(IDF_PATH)/examples/common_components/protocol_examples_common
-EXTRA_COMPONENT_DIRS += $(IDF_PATH)/examples/cxx/experimental/esp_mqtt_cxx/components
-EXTRA_COMPONENT_DIRS += $(IDF_PATH)/examples/cxx/experimental/experimental_cpp_component
-
-CXXFLAGS += -std=gnu++17
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/cxx/experimental/esp_mqtt_cxx/ssl/main/component.mk b/examples/cxx/experimental/esp_mqtt_cxx/ssl/main/component.mk
deleted file mode 100644
index c0c0f87e68..0000000000
--- a/examples/cxx/experimental/esp_mqtt_cxx/ssl/main/component.mk
+++ /dev/null
@@ -1 +0,0 @@
-COMPONENT_EMBED_TXTFILES := mqtt_eclipseprojects_io.pem
diff --git a/examples/cxx/experimental/esp_mqtt_cxx/tcp/Makefile b/examples/cxx/experimental/esp_mqtt_cxx/tcp/Makefile
deleted file mode 100644
index 392ad4a333..0000000000
--- a/examples/cxx/experimental/esp_mqtt_cxx/tcp/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-PROJECT_NAME := mqtt_tcp_cxx
-
-EXTRA_COMPONENT_DIRS := $(IDF_PATH)/examples/common_components/protocol_examples_common
-EXTRA_COMPONENT_DIRS += $(IDF_PATH)/examples/cxx/experimental/esp_mqtt_cxx/components
-EXTRA_COMPONENT_DIRS += $(IDF_PATH)/examples/cxx/experimental/experimental_cpp_component
-
-CXXFLAGS += -std=gnu++17
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/cxx/experimental/esp_mqtt_cxx/tcp/main/component.mk b/examples/cxx/experimental/esp_mqtt_cxx/tcp/main/component.mk
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/examples/cxx/experimental/esp_timer_cxx/Makefile b/examples/cxx/experimental/esp_timer_cxx/Makefile
deleted file mode 100644
index 8f26330b5c..0000000000
--- a/examples/cxx/experimental/esp_timer_cxx/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-EXTRA_COMPONENT_DIRS += ${IDF_PATH}/examples/cxx/experimental/experimental_cpp_component
-
-PROJECT_NAME := esp_timer_cxx
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/cxx/experimental/esp_timer_cxx/main/component.mk b/examples/cxx/experimental/esp_timer_cxx/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/cxx/experimental/esp_timer_cxx/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/cxx/experimental/experimental_cpp_component/component.mk b/examples/cxx/experimental/experimental_cpp_component/component.mk
deleted file mode 100644
index 7d3b7d373a..0000000000
--- a/examples/cxx/experimental/experimental_cpp_component/component.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-COMPONENT_ADD_INCLUDEDIRS := include private_include
-
-COMPONENT_SRCDIRS := ./ driver
diff --git a/examples/cxx/experimental/experimental_cpp_component/test/component.mk b/examples/cxx/experimental/experimental_cpp_component/test/component.mk
deleted file mode 100644
index 8b9586c0b3..0000000000
--- a/examples/cxx/experimental/experimental_cpp_component/test/component.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-#Component Makefile
-#
-
-COMPONENT_SRCDIRS := .
-
-COMPONENT_ADD_LDFLAGS = -Wl,--whole-archive -l$(COMPONENT_NAME) -Wl,--no-whole-archive
diff --git a/examples/cxx/experimental/sensor_mcp9808/Makefile b/examples/cxx/experimental/sensor_mcp9808/Makefile
deleted file mode 100644
index a2488937a5..0000000000
--- a/examples/cxx/experimental/sensor_mcp9808/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-EXTRA_COMPONENT_DIRS += ${IDF_PATH}/examples/cxx/experimental/experimental_cpp_component
-
-PROJECT_NAME := sensor_mcp9808
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/cxx/experimental/sensor_mcp9808/main/component.mk b/examples/cxx/experimental/sensor_mcp9808/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/cxx/experimental/sensor_mcp9808/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/cxx/experimental/simple_spi_rw_example/main/component.mk b/examples/cxx/experimental/simple_spi_rw_example/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/cxx/experimental/simple_spi_rw_example/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/cxx/pthread/Makefile b/examples/cxx/pthread/Makefile
deleted file mode 100644
index bfd94a11b9..0000000000
--- a/examples/cxx/pthread/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := cpp_pthread
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/cxx/pthread/main/component.mk b/examples/cxx/pthread/main/component.mk
deleted file mode 100644
index 44bd2b5273..0000000000
--- a/examples/cxx/pthread/main/component.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-#
-# Main Makefile. This is basically the same as a component makefile.
-#
diff --git a/examples/cxx/rtti/Makefile b/examples/cxx/rtti/Makefile
deleted file mode 100644
index ff6b842a7c..0000000000
--- a/examples/cxx/rtti/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := cpp_rtti
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/cxx/rtti/main/component.mk b/examples/cxx/rtti/main/component.mk
deleted file mode 100644
index 44bd2b5273..0000000000
--- a/examples/cxx/rtti/main/component.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-#
-# Main Makefile. This is basically the same as a component makefile.
-#
diff --git a/examples/ethernet/basic/Makefile b/examples/ethernet/basic/Makefile
deleted file mode 100644
index acb6d3a9ba..0000000000
--- a/examples/ethernet/basic/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := ethernet_basic
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/ethernet/basic/main/component.mk b/examples/ethernet/basic/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/ethernet/basic/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/ethernet/enc28j60/Makefile b/examples/ethernet/enc28j60/Makefile
deleted file mode 100644
index ebbd741d90..0000000000
--- a/examples/ethernet/enc28j60/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := enc28j60
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/ethernet/enc28j60/components/eth_enc28j60/component.mk b/examples/ethernet/enc28j60/components/eth_enc28j60/component.mk
deleted file mode 100644
index 9706df8e67..0000000000
--- a/examples/ethernet/enc28j60/components/eth_enc28j60/component.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
-
-COMPONENT_ADD_INCLUDEDIRS := .
diff --git a/examples/ethernet/enc28j60/main/component.mk b/examples/ethernet/enc28j60/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/ethernet/enc28j60/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/ethernet/eth2ap/Makefile b/examples/ethernet/eth2ap/Makefile
deleted file mode 100644
index fe024c7f62..0000000000
--- a/examples/ethernet/eth2ap/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := eth2ap
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/ethernet/eth2ap/main/component.mk b/examples/ethernet/eth2ap/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/ethernet/eth2ap/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/ethernet/iperf/Makefile b/examples/ethernet/iperf/Makefile
deleted file mode 100644
index dc3c419f2f..0000000000
--- a/examples/ethernet/iperf/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := ethernet_iperf
-
-EXTRA_COMPONENT_DIRS = $(IDF_PATH)/examples/system/console/advanced/components
-EXTRA_COMPONENT_DIRS += $(IDF_PATH)/examples/wifi/iperf/components
-EXTRA_COMPONENT_DIRS += $(IDF_PATH)/examples/common_components/iperf
-EXTRA_COMPONENT_DIRS += $(IDF_PATH)/examples/ethernet/enc28j60/components/eth_enc28j60
-
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/ethernet/iperf/main/component.mk b/examples/ethernet/iperf/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/ethernet/iperf/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/get-started/blink/Makefile b/examples/get-started/blink/Makefile
deleted file mode 100644
index 1ad06118b3..0000000000
--- a/examples/get-started/blink/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := blink
-
-EXTRA_COMPONENT_DIRS = $(IDF_PATH)/examples/common_components/led_strip
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/get-started/blink/main/component.mk b/examples/get-started/blink/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/get-started/blink/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/get-started/hello_world/Makefile b/examples/get-started/hello_world/Makefile
deleted file mode 100644
index 6d4e24f000..0000000000
--- a/examples/get-started/hello_world/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := hello_world
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/get-started/hello_world/main/component.mk b/examples/get-started/hello_world/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/get-started/hello_world/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/get-started/sample_project/Makefile b/examples/get-started/sample_project/Makefile
deleted file mode 100644
index da4d16c6aa..0000000000
--- a/examples/get-started/sample_project/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := sample_project
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/get-started/sample_project/main/component.mk b/examples/get-started/sample_project/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/get-started/sample_project/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/mesh/internal_communication/Makefile b/examples/mesh/internal_communication/Makefile
deleted file mode 100644
index 83a296c4cb..0000000000
--- a/examples/mesh/internal_communication/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := internal_communication
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/mesh/internal_communication/main/component.mk b/examples/mesh/internal_communication/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/mesh/internal_communication/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/mesh/ip_internal_network/Makefile b/examples/mesh/ip_internal_network/Makefile
deleted file mode 100644
index 86211310ee..0000000000
--- a/examples/mesh/ip_internal_network/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := ip_internal_network
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/mesh/ip_internal_network/main/component.mk b/examples/mesh/ip_internal_network/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/mesh/ip_internal_network/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/mesh/manual_networking/Makefile b/examples/mesh/manual_networking/Makefile
deleted file mode 100644
index 6fcd715f9e..0000000000
--- a/examples/mesh/manual_networking/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := manual_networking
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/mesh/manual_networking/main/component.mk b/examples/mesh/manual_networking/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/mesh/manual_networking/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/network/network_tests/Makefile b/examples/network/network_tests/Makefile
deleted file mode 100644
index 65c483b1f7..0000000000
--- a/examples/network/network_tests/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := net_suite
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/network/network_tests/main/component.mk b/examples/network/network_tests/main/component.mk
deleted file mode 100644
index 0adf45649a..0000000000
--- a/examples/network/network_tests/main/component.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Main component makefile.
-#
-# This Makefile can be left empty. By default, it will take the sources in the
-# src/ directory, compile them and link them into lib(subdirectory_name).a
-# in the build directory. This behaviour is entirely configurable,
-# please read the ESP-IDF documents if you need to do this.
-#
diff --git a/examples/network/simple_sniffer/Makefile b/examples/network/simple_sniffer/Makefile
deleted file mode 100644
index 51e1bca362..0000000000
--- a/examples/network/simple_sniffer/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := simple_sniffer
-
-EXTRA_COMPONENT_DIRS += $(IDF_PATH)/examples/common_components/pcap
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/network/simple_sniffer/main/component.mk b/examples/network/simple_sniffer/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/network/simple_sniffer/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/openthread/ot_br/Makefile b/examples/openthread/ot_br/Makefile
deleted file mode 100644
index 90be4f93ce..0000000000
--- a/examples/openthread/ot_br/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := esp_ot_br
-
-EXTRA_COMPONENT_DIRS = $(IDF_PATH)/examples/common_components/protocol_examples_common
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/openthread/ot_br/main/component.mk b/examples/openthread/ot_br/main/component.mk
deleted file mode 100644
index b928c2f543..0000000000
--- a/examples/openthread/ot_br/main/component.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
-
-COMPONENT_ADD_INCLUDEDIRS := .
-
-COMPONENT_PRIV_INCLUDEDIRS := .
diff --git a/examples/openthread/ot_cli/Makefile b/examples/openthread/ot_cli/Makefile
deleted file mode 100644
index 98515b5c16..0000000000
--- a/examples/openthread/ot_cli/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := esp_ot_cli
-
-EXTRA_COMPONENT_DIRS = $(IDF_PATH)/examples/common_components/iperf
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/openthread/ot_cli/main/component.mk b/examples/openthread/ot_cli/main/component.mk
deleted file mode 100644
index b928c2f543..0000000000
--- a/examples/openthread/ot_cli/main/component.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
-
-COMPONENT_ADD_INCLUDEDIRS := .
-
-COMPONENT_PRIV_INCLUDEDIRS := .
diff --git a/examples/openthread/ot_rcp/Makefile b/examples/openthread/ot_rcp/Makefile
deleted file mode 100644
index e167f2d2f8..0000000000
--- a/examples/openthread/ot_rcp/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := ot_esp_rcp
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/peripherals/adc/single_read/adc/Makefile b/examples/peripherals/adc/single_read/adc/Makefile
deleted file mode 100644
index e183ec8735..0000000000
--- a/examples/peripherals/adc/single_read/adc/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := adc
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/peripherals/adc/single_read/adc/main/component.mk b/examples/peripherals/adc/single_read/adc/main/component.mk
deleted file mode 100644
index 44bd2b5273..0000000000
--- a/examples/peripherals/adc/single_read/adc/main/component.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-#
-# Main Makefile. This is basically the same as a component makefile.
-#
diff --git a/examples/peripherals/adc/single_read/adc2/Makefile b/examples/peripherals/adc/single_read/adc2/Makefile
deleted file mode 100644
index 7176286536..0000000000
--- a/examples/peripherals/adc/single_read/adc2/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := adc2
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/peripherals/adc/single_read/adc2/main/component.mk b/examples/peripherals/adc/single_read/adc2/main/component.mk
deleted file mode 100644
index 44bd2b5273..0000000000
--- a/examples/peripherals/adc/single_read/adc2/main/component.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-#
-# Main Makefile. This is basically the same as a component makefile.
-#
diff --git a/examples/peripherals/adc/single_read/single_read/Makefile b/examples/peripherals/adc/single_read/single_read/Makefile
deleted file mode 100644
index af71b9c915..0000000000
--- a/examples/peripherals/adc/single_read/single_read/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := single_read
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/peripherals/adc/single_read/single_read/main/component.mk b/examples/peripherals/adc/single_read/single_read/main/component.mk
deleted file mode 100644
index 44bd2b5273..0000000000
--- a/examples/peripherals/adc/single_read/single_read/main/component.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-#
-# Main Makefile. This is basically the same as a component makefile.
-#
diff --git a/examples/peripherals/gpio/generic_gpio/Makefile b/examples/peripherals/gpio/generic_gpio/Makefile
deleted file mode 100644
index ec07e7abe6..0000000000
--- a/examples/peripherals/gpio/generic_gpio/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := generic_gpio
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/peripherals/gpio/generic_gpio/main/component.mk b/examples/peripherals/gpio/generic_gpio/main/component.mk
deleted file mode 100644
index 44bd2b5273..0000000000
--- a/examples/peripherals/gpio/generic_gpio/main/component.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-#
-# Main Makefile. This is basically the same as a component makefile.
-#
diff --git a/examples/peripherals/i2c/i2c_self_test/Makefile b/examples/peripherals/i2c/i2c_self_test/Makefile
deleted file mode 100644
index 35c17f6507..0000000000
--- a/examples/peripherals/i2c/i2c_self_test/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := i2c_example
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/peripherals/i2c/i2c_self_test/main/component.mk b/examples/peripherals/i2c/i2c_self_test/main/component.mk
deleted file mode 100644
index 44bd2b5273..0000000000
--- a/examples/peripherals/i2c/i2c_self_test/main/component.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-#
-# Main Makefile. This is basically the same as a component makefile.
-#
diff --git a/examples/peripherals/i2c/i2c_simple/Makefile b/examples/peripherals/i2c/i2c_simple/Makefile
deleted file mode 100644
index f8be8b947d..0000000000
--- a/examples/peripherals/i2c/i2c_simple/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := i2c-simple
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/peripherals/i2c/i2c_simple/main/component.mk b/examples/peripherals/i2c/i2c_simple/main/component.mk
deleted file mode 100644
index 87e08136f5..0000000000
--- a/examples/peripherals/i2c/i2c_simple/main/component.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-#
-# Main Makefile. This is basically the same as a component makefile .
-#
diff --git a/examples/peripherals/i2c/i2c_tools/Makefile b/examples/peripherals/i2c/i2c_tools/Makefile
deleted file mode 100644
index e2b60b6b3d..0000000000
--- a/examples/peripherals/i2c/i2c_tools/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := i2c_tools
-
-EXTRA_COMPONENT_DIRS = $(IDF_PATH)/examples/system/console/advanced/components
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/peripherals/i2c/i2c_tools/main/component.mk b/examples/peripherals/i2c/i2c_tools/main/component.mk
deleted file mode 100644
index 44bd2b5273..0000000000
--- a/examples/peripherals/i2c/i2c_tools/main/component.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-#
-# Main Makefile. This is basically the same as a component makefile.
-#
diff --git a/examples/peripherals/i2s/i2s_adc_dac/Makefile b/examples/peripherals/i2s/i2s_adc_dac/Makefile
deleted file mode 100644
index b14f445db4..0000000000
--- a/examples/peripherals/i2s/i2s_adc_dac/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := i2s_adc_dac
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/peripherals/i2s/i2s_adc_dac/main/component.mk b/examples/peripherals/i2s/i2s_adc_dac/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/peripherals/i2s/i2s_adc_dac/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/peripherals/i2s/i2s_audio_recorder_sdcard/Makefile b/examples/peripherals/i2s/i2s_audio_recorder_sdcard/Makefile
deleted file mode 100644
index 6e25cd97dd..0000000000
--- a/examples/peripherals/i2s/i2s_audio_recorder_sdcard/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-VERBOSE = 1
-PROJECT_NAME := esp32-i2s-recorder-example
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/peripherals/i2s/i2s_audio_recorder_sdcard/main/component.mk b/examples/peripherals/i2s/i2s_audio_recorder_sdcard/main/component.mk
deleted file mode 100644
index 9706df8e67..0000000000
--- a/examples/peripherals/i2s/i2s_audio_recorder_sdcard/main/component.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
-
-COMPONENT_ADD_INCLUDEDIRS := .
diff --git a/examples/peripherals/i2s/i2s_basic/Makefile b/examples/peripherals/i2s/i2s_basic/Makefile
deleted file mode 100644
index 19483dc353..0000000000
--- a/examples/peripherals/i2s/i2s_basic/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-VERBOSE = 1
-PROJECT_NAME := esp32_i2s_driver_example
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/peripherals/i2s/i2s_basic/main/component.mk b/examples/peripherals/i2s/i2s_basic/main/component.mk
deleted file mode 100644
index 9706df8e67..0000000000
--- a/examples/peripherals/i2s/i2s_basic/main/component.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
-
-COMPONENT_ADD_INCLUDEDIRS := .
diff --git a/examples/peripherals/lcd/tjpgd/Makefile b/examples/peripherals/lcd/tjpgd/Makefile
deleted file mode 100644
index e16bd1358e..0000000000
--- a/examples/peripherals/lcd/tjpgd/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := lcd_tjpgd
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/peripherals/lcd/tjpgd/main/component.mk b/examples/peripherals/lcd/tjpgd/main/component.mk
deleted file mode 100644
index 4ffe9e8ca2..0000000000
--- a/examples/peripherals/lcd/tjpgd/main/component.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Main Makefile. This is basically the same as a component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
-
-
-#Compile image file into the resulting firmware binary
-COMPONENT_EMBED_FILES := image.jpg
diff --git a/examples/peripherals/ledc/ledc_basic/Makefile b/examples/peripherals/ledc/ledc_basic/Makefile
deleted file mode 100644
index 63e461d010..0000000000
--- a/examples/peripherals/ledc/ledc_basic/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := ledc_basic
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/peripherals/ledc/ledc_basic/main/component.mk b/examples/peripherals/ledc/ledc_basic/main/component.mk
deleted file mode 100644
index 44bd2b5273..0000000000
--- a/examples/peripherals/ledc/ledc_basic/main/component.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-#
-# Main Makefile. This is basically the same as a component makefile.
-#
diff --git a/examples/peripherals/ledc/ledc_fade/Makefile b/examples/peripherals/ledc/ledc_fade/Makefile
deleted file mode 100644
index b4c762786d..0000000000
--- a/examples/peripherals/ledc/ledc_fade/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := ledc_fade
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/peripherals/ledc/ledc_fade/main/component.mk b/examples/peripherals/ledc/ledc_fade/main/component.mk
deleted file mode 100644
index 44bd2b5273..0000000000
--- a/examples/peripherals/ledc/ledc_fade/main/component.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-#
-# Main Makefile. This is basically the same as a component makefile.
-#
diff --git a/examples/peripherals/mcpwm/mcpwm_bldc_hall_control/Makefile b/examples/peripherals/mcpwm/mcpwm_bldc_hall_control/Makefile
deleted file mode 100644
index 5e6eca0206..0000000000
--- a/examples/peripherals/mcpwm/mcpwm_bldc_hall_control/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := mcpwm_bldc_hall_control
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/peripherals/mcpwm/mcpwm_bldc_hall_control/main/component.mk b/examples/peripherals/mcpwm/mcpwm_bldc_hall_control/main/component.mk
deleted file mode 100644
index 44bd2b5273..0000000000
--- a/examples/peripherals/mcpwm/mcpwm_bldc_hall_control/main/component.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-#
-# Main Makefile. This is basically the same as a component makefile.
-#
diff --git a/examples/peripherals/mcpwm/mcpwm_brushed_dc_control/Makefile b/examples/peripherals/mcpwm/mcpwm_brushed_dc_control/Makefile
deleted file mode 100644
index b7b8924a5a..0000000000
--- a/examples/peripherals/mcpwm/mcpwm_brushed_dc_control/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := mcpwm_brushed_dc_control
-
-EXTRA_COMPONENT_DIRS += $(IDF_PATH)/examples/common_components
-EXTRA_COMPONENT_DIRS += $(IDF_PATH)/examples/peripherals/pcnt/rotary_encoder/components
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/peripherals/mcpwm/mcpwm_brushed_dc_control/components/motor_ctrl_timer/component.mk b/examples/peripherals/mcpwm/mcpwm_brushed_dc_control/components/motor_ctrl_timer/component.mk
deleted file mode 100644
index 27ad11a7e5..0000000000
--- a/examples/peripherals/mcpwm/mcpwm_brushed_dc_control/components/motor_ctrl_timer/component.mk
+++ /dev/null
@@ -1 +0,0 @@
-COMPONENT_ADD_INCLUDEDIRS := .
diff --git a/examples/peripherals/mcpwm/mcpwm_brushed_dc_control/main/component.mk b/examples/peripherals/mcpwm/mcpwm_brushed_dc_control/main/component.mk
deleted file mode 100644
index 44bd2b5273..0000000000
--- a/examples/peripherals/mcpwm/mcpwm_brushed_dc_control/main/component.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-#
-# Main Makefile. This is basically the same as a component makefile.
-#
diff --git a/examples/peripherals/mcpwm/mcpwm_capture_hc_sr04/Makefile b/examples/peripherals/mcpwm/mcpwm_capture_hc_sr04/Makefile
deleted file mode 100644
index 588de3b21e..0000000000
--- a/examples/peripherals/mcpwm/mcpwm_capture_hc_sr04/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := mcpwm_capture_hc_sr04
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/peripherals/mcpwm/mcpwm_capture_hc_sr04/main/component.mk b/examples/peripherals/mcpwm/mcpwm_capture_hc_sr04/main/component.mk
deleted file mode 100644
index 44bd2b5273..0000000000
--- a/examples/peripherals/mcpwm/mcpwm_capture_hc_sr04/main/component.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-#
-# Main Makefile. This is basically the same as a component makefile.
-#
diff --git a/examples/peripherals/mcpwm/mcpwm_servo_control/Makefile b/examples/peripherals/mcpwm/mcpwm_servo_control/Makefile
deleted file mode 100644
index 5dd16cc6b5..0000000000
--- a/examples/peripherals/mcpwm/mcpwm_servo_control/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := mcpwm_servo_control
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/peripherals/mcpwm/mcpwm_servo_control/main/component.mk b/examples/peripherals/mcpwm/mcpwm_servo_control/main/component.mk
deleted file mode 100644
index 44bd2b5273..0000000000
--- a/examples/peripherals/mcpwm/mcpwm_servo_control/main/component.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-#
-# Main Makefile. This is basically the same as a component makefile.
-#
diff --git a/examples/peripherals/mcpwm/mcpwm_sync_example/Makefile b/examples/peripherals/mcpwm/mcpwm_sync_example/Makefile
deleted file mode 100644
index d3efb27d2f..0000000000
--- a/examples/peripherals/mcpwm/mcpwm_sync_example/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := mcpwm_sync_example
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/peripherals/mcpwm/mcpwm_sync_example/main/component.mk b/examples/peripherals/mcpwm/mcpwm_sync_example/main/component.mk
deleted file mode 100644
index 44bd2b5273..0000000000
--- a/examples/peripherals/mcpwm/mcpwm_sync_example/main/component.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-#
-# Main Makefile. This is basically the same as a component makefile.
-#
diff --git a/examples/peripherals/pcnt/pulse_count_event/Makefile b/examples/peripherals/pcnt/pulse_count_event/Makefile
deleted file mode 100644
index 1b7b19fa83..0000000000
--- a/examples/peripherals/pcnt/pulse_count_event/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := pcnt_event
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/peripherals/pcnt/pulse_count_event/main/component.mk b/examples/peripherals/pcnt/pulse_count_event/main/component.mk
deleted file mode 100644
index 44bd2b5273..0000000000
--- a/examples/peripherals/pcnt/pulse_count_event/main/component.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-#
-# Main Makefile. This is basically the same as a component makefile.
-#
diff --git a/examples/peripherals/pcnt/rotary_encoder/Makefile b/examples/peripherals/pcnt/rotary_encoder/Makefile
deleted file mode 100644
index 753ed4c40f..0000000000
--- a/examples/peripherals/pcnt/rotary_encoder/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := rotary_encoder
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/peripherals/pcnt/rotary_encoder/components/rotary_encoder/component.mk b/examples/peripherals/pcnt/rotary_encoder/components/rotary_encoder/component.mk
deleted file mode 100644
index 24cab8b637..0000000000
--- a/examples/peripherals/pcnt/rotary_encoder/components/rotary_encoder/component.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-COMPONENT_ADD_INCLUDEDIRS := include
-
-COMPONENT_SRCDIRS := src
diff --git a/examples/peripherals/pcnt/rotary_encoder/main/component.mk b/examples/peripherals/pcnt/rotary_encoder/main/component.mk
deleted file mode 100644
index 44bd2b5273..0000000000
--- a/examples/peripherals/pcnt/rotary_encoder/main/component.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-#
-# Main Makefile. This is basically the same as a component makefile.
-#
diff --git a/examples/peripherals/rmt/ir_protocols/Makefile b/examples/peripherals/rmt/ir_protocols/Makefile
deleted file mode 100644
index 949e627727..0000000000
--- a/examples/peripherals/rmt/ir_protocols/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := ir_protocols
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/peripherals/rmt/ir_protocols/components/infrared_tools/component.mk b/examples/peripherals/rmt/ir_protocols/components/infrared_tools/component.mk
deleted file mode 100644
index 24cab8b637..0000000000
--- a/examples/peripherals/rmt/ir_protocols/components/infrared_tools/component.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-COMPONENT_ADD_INCLUDEDIRS := include
-
-COMPONENT_SRCDIRS := src
diff --git a/examples/peripherals/rmt/ir_protocols/main/component.mk b/examples/peripherals/rmt/ir_protocols/main/component.mk
deleted file mode 100644
index b4fa72791c..0000000000
--- a/examples/peripherals/rmt/ir_protocols/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# Main Makefile. This is basically the same as a component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/peripherals/rmt/led_strip/Makefile b/examples/peripherals/rmt/led_strip/Makefile
deleted file mode 100644
index 8baa634627..0000000000
--- a/examples/peripherals/rmt/led_strip/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := led_strip
-
-EXTRA_COMPONENT_DIRS = $(IDF_PATH)/examples/common_components/led_strip
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/peripherals/rmt/led_strip/main/component.mk b/examples/peripherals/rmt/led_strip/main/component.mk
deleted file mode 100644
index b4fa72791c..0000000000
--- a/examples/peripherals/rmt/led_strip/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# Main Makefile. This is basically the same as a component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/peripherals/rmt/morse_code/Makefile b/examples/peripherals/rmt/morse_code/Makefile
deleted file mode 100644
index 7054dce932..0000000000
--- a/examples/peripherals/rmt/morse_code/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := morse_code
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/peripherals/rmt/morse_code/main/component.mk b/examples/peripherals/rmt/morse_code/main/component.mk
deleted file mode 100644
index b4fa72791c..0000000000
--- a/examples/peripherals/rmt/morse_code/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# Main Makefile. This is basically the same as a component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/peripherals/rmt/step_motor/Makefile b/examples/peripherals/rmt/step_motor/Makefile
deleted file mode 100644
index 210da8626b..0000000000
--- a/examples/peripherals/rmt/step_motor/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := step_motor
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/peripherals/rmt/step_motor/main/component.mk b/examples/peripherals/rmt/step_motor/main/component.mk
deleted file mode 100644
index b4fa72791c..0000000000
--- a/examples/peripherals/rmt/step_motor/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# Main Makefile. This is basically the same as a component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/peripherals/sdio/host/Makefile b/examples/peripherals/sdio/host/Makefile
deleted file mode 100644
index 2b313cca48..0000000000
--- a/examples/peripherals/sdio/host/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := sdio_host
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/peripherals/sdio/host/main/component.mk b/examples/peripherals/sdio/host/main/component.mk
deleted file mode 100644
index 0adf45649a..0000000000
--- a/examples/peripherals/sdio/host/main/component.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Main component makefile.
-#
-# This Makefile can be left empty. By default, it will take the sources in the
-# src/ directory, compile them and link them into lib(subdirectory_name).a
-# in the build directory. This behaviour is entirely configurable,
-# please read the ESP-IDF documents if you need to do this.
-#
diff --git a/examples/peripherals/sdio/slave/Makefile b/examples/peripherals/sdio/slave/Makefile
deleted file mode 100644
index 6f35803ef1..0000000000
--- a/examples/peripherals/sdio/slave/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := sdio_slave
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/peripherals/sdio/slave/main/component.mk b/examples/peripherals/sdio/slave/main/component.mk
deleted file mode 100644
index 0adf45649a..0000000000
--- a/examples/peripherals/sdio/slave/main/component.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Main component makefile.
-#
-# This Makefile can be left empty. By default, it will take the sources in the
-# src/ directory, compile them and link them into lib(subdirectory_name).a
-# in the build directory. This behaviour is entirely configurable,
-# please read the ESP-IDF documents if you need to do this.
-#
diff --git a/examples/peripherals/secure_element/atecc608_ecdsa/Makefile b/examples/peripherals/secure_element/atecc608_ecdsa/Makefile
deleted file mode 100644
index eb625d1f74..0000000000
--- a/examples/peripherals/secure_element/atecc608_ecdsa/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := atecc608a_ecdsa
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/peripherals/secure_element/atecc608_ecdsa/main/component.mk b/examples/peripherals/secure_element/atecc608_ecdsa/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/peripherals/secure_element/atecc608_ecdsa/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/peripherals/sigmadelta/Makefile b/examples/peripherals/sigmadelta/Makefile
deleted file mode 100644
index 81f5e77f5a..0000000000
--- a/examples/peripherals/sigmadelta/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := sigmadelta
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/peripherals/sigmadelta/main/component.mk b/examples/peripherals/sigmadelta/main/component.mk
deleted file mode 100644
index b4fa72791c..0000000000
--- a/examples/peripherals/sigmadelta/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# Main Makefile. This is basically the same as a component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/peripherals/spi_master/hd_eeprom/Makefile b/examples/peripherals/spi_master/hd_eeprom/Makefile
deleted file mode 100644
index 70d248d1e9..0000000000
--- a/examples/peripherals/spi_master/hd_eeprom/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := spi_eeprom
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/peripherals/spi_master/hd_eeprom/components/eeprom/component.mk b/examples/peripherals/spi_master/hd_eeprom/components/eeprom/component.mk
deleted file mode 100644
index efad18a765..0000000000
--- a/examples/peripherals/spi_master/hd_eeprom/components/eeprom/component.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Main Makefile. This is basically the same as a component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
-
-COMPONENT_ADD_LDFRAGMENTS += linker.lf
-COMPONENT_ADD_INCLUDEDIRS := .
diff --git a/examples/peripherals/spi_master/hd_eeprom/main/component.mk b/examples/peripherals/spi_master/hd_eeprom/main/component.mk
deleted file mode 100644
index b4fa72791c..0000000000
--- a/examples/peripherals/spi_master/hd_eeprom/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# Main Makefile. This is basically the same as a component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/peripherals/spi_master/lcd/Makefile b/examples/peripherals/spi_master/lcd/Makefile
deleted file mode 100644
index bb969cd5d3..0000000000
--- a/examples/peripherals/spi_master/lcd/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := spi_master
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/peripherals/spi_master/lcd/main/component.mk b/examples/peripherals/spi_master/lcd/main/component.mk
deleted file mode 100644
index 4ffe9e8ca2..0000000000
--- a/examples/peripherals/spi_master/lcd/main/component.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Main Makefile. This is basically the same as a component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
-
-
-#Compile image file into the resulting firmware binary
-COMPONENT_EMBED_FILES := image.jpg
diff --git a/examples/peripherals/spi_slave/receiver/Makefile b/examples/peripherals/spi_slave/receiver/Makefile
deleted file mode 100644
index ac81e8f6d2..0000000000
--- a/examples/peripherals/spi_slave/receiver/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := spi_slave_receiver
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/peripherals/spi_slave/receiver/main/component.mk b/examples/peripherals/spi_slave/receiver/main/component.mk
deleted file mode 100644
index 0adf45649a..0000000000
--- a/examples/peripherals/spi_slave/receiver/main/component.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Main component makefile.
-#
-# This Makefile can be left empty. By default, it will take the sources in the
-# src/ directory, compile them and link them into lib(subdirectory_name).a
-# in the build directory. This behaviour is entirely configurable,
-# please read the ESP-IDF documents if you need to do this.
-#
diff --git a/examples/peripherals/spi_slave/sender/Makefile b/examples/peripherals/spi_slave/sender/Makefile
deleted file mode 100644
index d1225cf479..0000000000
--- a/examples/peripherals/spi_slave/sender/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := spi_slave_sender
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/peripherals/spi_slave/sender/main/component.mk b/examples/peripherals/spi_slave/sender/main/component.mk
deleted file mode 100644
index 0adf45649a..0000000000
--- a/examples/peripherals/spi_slave/sender/main/component.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Main component makefile.
-#
-# This Makefile can be left empty. By default, it will take the sources in the
-# src/ directory, compile them and link them into lib(subdirectory_name).a
-# in the build directory. This behaviour is entirely configurable,
-# please read the ESP-IDF documents if you need to do this.
-#
diff --git a/examples/peripherals/spi_slave_hd/append_mode/master/Makefile b/examples/peripherals/spi_slave_hd/append_mode/master/Makefile
deleted file mode 100644
index d62643e9c3..0000000000
--- a/examples/peripherals/spi_slave_hd/append_mode/master/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := spi-slave-hd-append-master
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/peripherals/spi_slave_hd/append_mode/master/main/component.mk b/examples/peripherals/spi_slave_hd/append_mode/master/main/component.mk
deleted file mode 100644
index 0adf45649a..0000000000
--- a/examples/peripherals/spi_slave_hd/append_mode/master/main/component.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Main component makefile.
-#
-# This Makefile can be left empty. By default, it will take the sources in the
-# src/ directory, compile them and link them into lib(subdirectory_name).a
-# in the build directory. This behaviour is entirely configurable,
-# please read the ESP-IDF documents if you need to do this.
-#
diff --git a/examples/peripherals/spi_slave_hd/segment_mode/seg_master/Makefile b/examples/peripherals/spi_slave_hd/segment_mode/seg_master/Makefile
deleted file mode 100644
index 31ddcb8f99..0000000000
--- a/examples/peripherals/spi_slave_hd/segment_mode/seg_master/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := spi_slave_hd_seg_master
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/peripherals/spi_slave_hd/segment_mode/seg_master/main/component.mk b/examples/peripherals/spi_slave_hd/segment_mode/seg_master/main/component.mk
deleted file mode 100644
index 0adf45649a..0000000000
--- a/examples/peripherals/spi_slave_hd/segment_mode/seg_master/main/component.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Main component makefile.
-#
-# This Makefile can be left empty. By default, it will take the sources in the
-# src/ directory, compile them and link them into lib(subdirectory_name).a
-# in the build directory. This behaviour is entirely configurable,
-# please read the ESP-IDF documents if you need to do this.
-#
diff --git a/examples/peripherals/temp_sensor/main/component.mk b/examples/peripherals/temp_sensor/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/peripherals/temp_sensor/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/peripherals/timer_group/Makefile b/examples/peripherals/timer_group/Makefile
deleted file mode 100644
index e923a507a8..0000000000
--- a/examples/peripherals/timer_group/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := timer_group
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/peripherals/timer_group/main/component.mk b/examples/peripherals/timer_group/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/peripherals/timer_group/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/peripherals/touch_sensor/touch_sensor_v1/touch_pad_interrupt/Makefile b/examples/peripherals/touch_sensor/touch_sensor_v1/touch_pad_interrupt/Makefile
deleted file mode 100644
index cbe818b212..0000000000
--- a/examples/peripherals/touch_sensor/touch_sensor_v1/touch_pad_interrupt/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := touch_pad_interrupt
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/peripherals/touch_sensor/touch_sensor_v1/touch_pad_interrupt/main/component.mk b/examples/peripherals/touch_sensor/touch_sensor_v1/touch_pad_interrupt/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/peripherals/touch_sensor/touch_sensor_v1/touch_pad_interrupt/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/peripherals/touch_sensor/touch_sensor_v1/touch_pad_read/Makefile b/examples/peripherals/touch_sensor/touch_sensor_v1/touch_pad_read/Makefile
deleted file mode 100644
index 12c01b12aa..0000000000
--- a/examples/peripherals/touch_sensor/touch_sensor_v1/touch_pad_read/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := touch_pad_read
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/peripherals/touch_sensor/touch_sensor_v1/touch_pad_read/main/component.mk b/examples/peripherals/touch_sensor/touch_sensor_v1/touch_pad_read/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/peripherals/touch_sensor/touch_sensor_v1/touch_pad_read/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/peripherals/touch_sensor/touch_sensor_v2/touch_pad_interrupt/Makefile b/examples/peripherals/touch_sensor/touch_sensor_v2/touch_pad_interrupt/Makefile
deleted file mode 100644
index cbe818b212..0000000000
--- a/examples/peripherals/touch_sensor/touch_sensor_v2/touch_pad_interrupt/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := touch_pad_interrupt
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/peripherals/touch_sensor/touch_sensor_v2/touch_pad_interrupt/main/component.mk b/examples/peripherals/touch_sensor/touch_sensor_v2/touch_pad_interrupt/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/peripherals/touch_sensor/touch_sensor_v2/touch_pad_interrupt/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/peripherals/touch_sensor/touch_sensor_v2/touch_pad_read/Makefile b/examples/peripherals/touch_sensor/touch_sensor_v2/touch_pad_read/Makefile
deleted file mode 100644
index 12c01b12aa..0000000000
--- a/examples/peripherals/touch_sensor/touch_sensor_v2/touch_pad_read/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := touch_pad_read
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/peripherals/touch_sensor/touch_sensor_v2/touch_pad_read/main/component.mk b/examples/peripherals/touch_sensor/touch_sensor_v2/touch_pad_read/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/peripherals/touch_sensor/touch_sensor_v2/touch_pad_read/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/peripherals/twai/twai_alert_and_recovery/Makefile b/examples/peripherals/twai/twai_alert_and_recovery/Makefile
deleted file mode 100644
index f60ffdc102..0000000000
--- a/examples/peripherals/twai/twai_alert_and_recovery/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := twai_alert_and_recovery_example
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/peripherals/twai/twai_alert_and_recovery/main/component.mk b/examples/peripherals/twai/twai_alert_and_recovery/main/component.mk
deleted file mode 100644
index b4fa72791c..0000000000
--- a/examples/peripherals/twai/twai_alert_and_recovery/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# Main Makefile. This is basically the same as a component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/peripherals/twai/twai_network/twai_network_listen_only/Makefile b/examples/peripherals/twai/twai_network/twai_network_listen_only/Makefile
deleted file mode 100644
index fc00a388d2..0000000000
--- a/examples/peripherals/twai/twai_network/twai_network_listen_only/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := twai_network_listen_only
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/peripherals/twai/twai_network/twai_network_listen_only/main/component.mk b/examples/peripherals/twai/twai_network/twai_network_listen_only/main/component.mk
deleted file mode 100644
index b4fa72791c..0000000000
--- a/examples/peripherals/twai/twai_network/twai_network_listen_only/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# Main Makefile. This is basically the same as a component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/peripherals/twai/twai_network/twai_network_master/Makefile b/examples/peripherals/twai/twai_network/twai_network_master/Makefile
deleted file mode 100644
index 78ed15fb56..0000000000
--- a/examples/peripherals/twai/twai_network/twai_network_master/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := twai_network_master
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/peripherals/twai/twai_network/twai_network_master/main/component.mk b/examples/peripherals/twai/twai_network/twai_network_master/main/component.mk
deleted file mode 100644
index b4fa72791c..0000000000
--- a/examples/peripherals/twai/twai_network/twai_network_master/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# Main Makefile. This is basically the same as a component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/peripherals/twai/twai_network/twai_network_slave/Makefile b/examples/peripherals/twai/twai_network/twai_network_slave/Makefile
deleted file mode 100644
index 9f3324f7f3..0000000000
--- a/examples/peripherals/twai/twai_network/twai_network_slave/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := twai_network_slave
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/peripherals/twai/twai_network/twai_network_slave/main/component.mk b/examples/peripherals/twai/twai_network/twai_network_slave/main/component.mk
deleted file mode 100644
index b4fa72791c..0000000000
--- a/examples/peripherals/twai/twai_network/twai_network_slave/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# Main Makefile. This is basically the same as a component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/peripherals/twai/twai_self_test/Makefile b/examples/peripherals/twai/twai_self_test/Makefile
deleted file mode 100644
index 286a8df30f..0000000000
--- a/examples/peripherals/twai/twai_self_test/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := twai_self_test_example
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/peripherals/twai/twai_self_test/main/component.mk b/examples/peripherals/twai/twai_self_test/main/component.mk
deleted file mode 100644
index b4fa72791c..0000000000
--- a/examples/peripherals/twai/twai_self_test/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# Main Makefile. This is basically the same as a component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/peripherals/uart/nmea0183_parser/Makefile b/examples/peripherals/uart/nmea0183_parser/Makefile
deleted file mode 100644
index b00917bbc0..0000000000
--- a/examples/peripherals/uart/nmea0183_parser/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := nmea_parser
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/peripherals/uart/nmea0183_parser/main/component.mk b/examples/peripherals/uart/nmea0183_parser/main/component.mk
deleted file mode 100644
index 44bd2b5273..0000000000
--- a/examples/peripherals/uart/nmea0183_parser/main/component.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-#
-# Main Makefile. This is basically the same as a component makefile.
-#
diff --git a/examples/peripherals/uart/uart_async_rxtxtasks/Makefile b/examples/peripherals/uart/uart_async_rxtxtasks/Makefile
deleted file mode 100644
index 250ca73163..0000000000
--- a/examples/peripherals/uart/uart_async_rxtxtasks/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := uart_async_rxtxtasks
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/peripherals/uart/uart_async_rxtxtasks/main/component.mk b/examples/peripherals/uart/uart_async_rxtxtasks/main/component.mk
deleted file mode 100644
index 44bd2b5273..0000000000
--- a/examples/peripherals/uart/uart_async_rxtxtasks/main/component.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-#
-# Main Makefile. This is basically the same as a component makefile.
-#
diff --git a/examples/peripherals/uart/uart_echo/Makefile b/examples/peripherals/uart/uart_echo/Makefile
deleted file mode 100644
index 5e605599fc..0000000000
--- a/examples/peripherals/uart/uart_echo/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := uart_echo
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/peripherals/uart/uart_echo/main/component.mk b/examples/peripherals/uart/uart_echo/main/component.mk
deleted file mode 100644
index 44bd2b5273..0000000000
--- a/examples/peripherals/uart/uart_echo/main/component.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-#
-# Main Makefile. This is basically the same as a component makefile.
-#
diff --git a/examples/peripherals/uart/uart_echo_rs485/Makefile b/examples/peripherals/uart/uart_echo_rs485/Makefile
deleted file mode 100644
index ca342e1914..0000000000
--- a/examples/peripherals/uart/uart_echo_rs485/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := echo_rs485
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/peripherals/uart/uart_echo_rs485/main/component.mk b/examples/peripherals/uart/uart_echo_rs485/main/component.mk
deleted file mode 100644
index 44bd2b5273..0000000000
--- a/examples/peripherals/uart/uart_echo_rs485/main/component.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-#
-# Main Makefile. This is basically the same as a component makefile.
-#
diff --git a/examples/peripherals/uart/uart_events/Makefile b/examples/peripherals/uart/uart_events/Makefile
deleted file mode 100644
index f23dd39c4b..0000000000
--- a/examples/peripherals/uart/uart_events/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := uart_events
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/peripherals/uart/uart_events/main/component.mk b/examples/peripherals/uart/uart_events/main/component.mk
deleted file mode 100644
index 44bd2b5273..0000000000
--- a/examples/peripherals/uart/uart_events/main/component.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-#
-# Main Makefile. This is basically the same as a component makefile.
-#
diff --git a/examples/peripherals/uart/uart_repl/Makefile b/examples/peripherals/uart/uart_repl/Makefile
deleted file mode 100644
index 1209a9b3b7..0000000000
--- a/examples/peripherals/uart/uart_repl/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := uart_repl
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/peripherals/uart/uart_repl/main/component.mk b/examples/peripherals/uart/uart_repl/main/component.mk
deleted file mode 100644
index 44bd2b5273..0000000000
--- a/examples/peripherals/uart/uart_repl/main/component.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-#
-# Main Makefile. This is basically the same as a component makefile.
-#
diff --git a/examples/peripherals/uart/uart_select/Makefile b/examples/peripherals/uart/uart_select/Makefile
deleted file mode 100644
index 010458f74c..0000000000
--- a/examples/peripherals/uart/uart_select/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := uart_select
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/peripherals/uart/uart_select/main/component.mk b/examples/peripherals/uart/uart_select/main/component.mk
deleted file mode 100644
index 44bd2b5273..0000000000
--- a/examples/peripherals/uart/uart_select/main/component.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-#
-# Main Makefile. This is basically the same as a component makefile.
-#
diff --git a/examples/peripherals/wave_gen/Makefile b/examples/peripherals/wave_gen/Makefile
deleted file mode 100644
index 1703f52297..0000000000
--- a/examples/peripherals/wave_gen/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := wave_gen
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/peripherals/wave_gen/main/component.mk b/examples/peripherals/wave_gen/main/component.mk
deleted file mode 100644
index 44bd2b5273..0000000000
--- a/examples/peripherals/wave_gen/main/component.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-#
-# Main Makefile. This is basically the same as a component makefile.
-#
diff --git a/examples/protocols/asio/asio_chat/Makefile b/examples/protocols/asio/asio_chat/Makefile
deleted file mode 100644
index 93950cb9a9..0000000000
--- a/examples/protocols/asio/asio_chat/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-PROJECT_NAME := asio_chat
-
-EXTRA_COMPONENT_DIRS = $(IDF_PATH)/examples/common_components/protocol_examples_common
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/protocols/asio/asio_chat/main/component.mk b/examples/protocols/asio/asio_chat/main/component.mk
deleted file mode 100644
index 0adf45649a..0000000000
--- a/examples/protocols/asio/asio_chat/main/component.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Main component makefile.
-#
-# This Makefile can be left empty. By default, it will take the sources in the
-# src/ directory, compile them and link them into lib(subdirectory_name).a
-# in the build directory. This behaviour is entirely configurable,
-# please read the ESP-IDF documents if you need to do this.
-#
diff --git a/examples/protocols/asio/ssl_client_server/Makefile b/examples/protocols/asio/ssl_client_server/Makefile
deleted file mode 100644
index af59f284f4..0000000000
--- a/examples/protocols/asio/ssl_client_server/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-PROJECT_NAME := asio_ssl_client_server
-
-EXTRA_COMPONENT_DIRS = $(IDF_PATH)/examples/common_components/protocol_examples_common
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/protocols/asio/ssl_client_server/main/component.mk b/examples/protocols/asio/ssl_client_server/main/component.mk
deleted file mode 100644
index 36ed173b93..0000000000
--- a/examples/protocols/asio/ssl_client_server/main/component.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# Main component makefile.
-#
-# This Makefile can be left empty. By default, it will take the sources in the
-# src/ directory, compile them and link them into lib(subdirectory_name).a
-# in the build directory. This behaviour is entirely configurable,
-# please read the ESP-IDF documents if you need to do this.
-#
-
-COMPONENT_EMBED_TXTFILES := ca.crt
-COMPONENT_EMBED_TXTFILES += server.key
-COMPONENT_EMBED_TXTFILES += srv.crt
diff --git a/examples/protocols/asio/tcp_echo_server/Makefile b/examples/protocols/asio/tcp_echo_server/Makefile
deleted file mode 100644
index ed9cfb8d8f..0000000000
--- a/examples/protocols/asio/tcp_echo_server/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-PROJECT_NAME := asio_tcp_echo_server
-
-EXTRA_COMPONENT_DIRS = $(IDF_PATH)/examples/common_components/protocol_examples_common
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/protocols/asio/tcp_echo_server/main/component.mk b/examples/protocols/asio/tcp_echo_server/main/component.mk
deleted file mode 100644
index 0adf45649a..0000000000
--- a/examples/protocols/asio/tcp_echo_server/main/component.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Main component makefile.
-#
-# This Makefile can be left empty. By default, it will take the sources in the
-# src/ directory, compile them and link them into lib(subdirectory_name).a
-# in the build directory. This behaviour is entirely configurable,
-# please read the ESP-IDF documents if you need to do this.
-#
diff --git a/examples/protocols/asio/udp_echo_server/Makefile b/examples/protocols/asio/udp_echo_server/Makefile
deleted file mode 100644
index f28a9d96ad..0000000000
--- a/examples/protocols/asio/udp_echo_server/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-PROJECT_NAME := asio_udp_echo_server
-
-EXTRA_COMPONENT_DIRS = $(IDF_PATH)/examples/common_components/protocol_examples_common
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/protocols/asio/udp_echo_server/main/component.mk b/examples/protocols/asio/udp_echo_server/main/component.mk
deleted file mode 100644
index 0adf45649a..0000000000
--- a/examples/protocols/asio/udp_echo_server/main/component.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Main component makefile.
-#
-# This Makefile can be left empty. By default, it will take the sources in the
-# src/ directory, compile them and link them into lib(subdirectory_name).a
-# in the build directory. This behaviour is entirely configurable,
-# please read the ESP-IDF documents if you need to do this.
-#
diff --git a/examples/protocols/cbor/Makefile b/examples/protocols/cbor/Makefile
deleted file mode 100644
index 5df7f3f39f..0000000000
--- a/examples/protocols/cbor/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := cbor
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/protocols/cbor/main/component.mk b/examples/protocols/cbor/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/protocols/cbor/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/protocols/coap_client/Makefile b/examples/protocols/coap_client/Makefile
deleted file mode 100644
index 3da4b416a7..0000000000
--- a/examples/protocols/coap_client/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := coap_client
-
-EXTRA_COMPONENT_DIRS = $(IDF_PATH)/examples/common_components/protocol_examples_common
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/protocols/coap_client/main/component.mk b/examples/protocols/coap_client/main/component.mk
deleted file mode 100644
index 51bf0b68c7..0000000000
--- a/examples/protocols/coap_client/main/component.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
-
-# embed files from the "certs" directory as binary data symbols
-# in the app
-COMPONENT_EMBED_TXTFILES := certs/coap_ca.pem certs/coap_client.crt certs/coap_client.key
diff --git a/examples/protocols/coap_server/Makefile b/examples/protocols/coap_server/Makefile
deleted file mode 100644
index b8a03c3034..0000000000
--- a/examples/protocols/coap_server/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := coap_server
-
-EXTRA_COMPONENT_DIRS = $(IDF_PATH)/examples/common_components/protocol_examples_common
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/protocols/coap_server/main/component.mk b/examples/protocols/coap_server/main/component.mk
deleted file mode 100644
index d3d1de0b01..0000000000
--- a/examples/protocols/coap_server/main/component.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
-
-# embed files from the "certs" directory as binary data symbols
-# in the app
-COMPONENT_EMBED_TXTFILES := certs/coap_ca.pem certs/coap_server.crt certs/coap_server.key
diff --git a/examples/protocols/esp_http_client/Makefile b/examples/protocols/esp_http_client/Makefile
deleted file mode 100644
index 51fb224bee..0000000000
--- a/examples/protocols/esp_http_client/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := esp_http_client_example
-
-EXTRA_COMPONENT_DIRS = $(IDF_PATH)/examples/common_components/protocol_examples_common
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/protocols/esp_http_client/main/component.mk b/examples/protocols/esp_http_client/main/component.mk
deleted file mode 100644
index c1f04b76bc..0000000000
--- a/examples/protocols/esp_http_client/main/component.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
-
-# embed files from the "certs" directory as binary data symbols
-# in the app
-COMPONENT_EMBED_TXTFILES := howsmyssl_com_root_cert.pem postman_root_cert.pem
diff --git a/examples/protocols/esp_local_ctrl/Makefile b/examples/protocols/esp_local_ctrl/Makefile
deleted file mode 100644
index 488182621a..0000000000
--- a/examples/protocols/esp_local_ctrl/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := esp_local_ctrl
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/protocols/esp_local_ctrl/main/component.mk b/examples/protocols/esp_local_ctrl/main/component.mk
deleted file mode 100644
index b120d66e5e..0000000000
--- a/examples/protocols/esp_local_ctrl/main/component.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
-
-COMPONENT_EMBED_TXTFILES := certs/cacert.pem
-COMPONENT_EMBED_TXTFILES += certs/prvtkey.pem
diff --git a/examples/protocols/http2_request/Makefile b/examples/protocols/http2_request/Makefile
deleted file mode 100644
index aaa24ef2b8..0000000000
--- a/examples/protocols/http2_request/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := http2-request
-
-EXTRA_COMPONENT_DIRS = $(IDF_PATH)/examples/common_components/protocol_examples_common
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/protocols/http2_request/components/sh2lib/component.mk b/examples/protocols/http2_request/components/sh2lib/component.mk
deleted file mode 100644
index 27ad11a7e5..0000000000
--- a/examples/protocols/http2_request/components/sh2lib/component.mk
+++ /dev/null
@@ -1 +0,0 @@
-COMPONENT_ADD_INCLUDEDIRS := .
diff --git a/examples/protocols/http2_request/main/component.mk b/examples/protocols/http2_request/main/component.mk
deleted file mode 100644
index ff8e5fbdbf..0000000000
--- a/examples/protocols/http2_request/main/component.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
-COMPONENT_EMBED_TXTFILES := golang_root_cert.pem
diff --git a/examples/protocols/http_request/Makefile b/examples/protocols/http_request/Makefile
deleted file mode 100644
index 8a552e13c9..0000000000
--- a/examples/protocols/http_request/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := http_request
-
-EXTRA_COMPONENT_DIRS = $(IDF_PATH)/examples/common_components/protocol_examples_common
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/protocols/http_request/main/component.mk b/examples/protocols/http_request/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/protocols/http_request/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/protocols/http_server/advanced_tests/Makefile b/examples/protocols/http_server/advanced_tests/Makefile
deleted file mode 100644
index e66a747330..0000000000
--- a/examples/protocols/http_server/advanced_tests/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := tests
-
-EXTRA_COMPONENT_DIRS = $(IDF_PATH)/examples/common_components/protocol_examples_common
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/protocols/http_server/advanced_tests/main/component.mk b/examples/protocols/http_server/advanced_tests/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/protocols/http_server/advanced_tests/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/protocols/http_server/captive_portal/Makefile b/examples/protocols/http_server/captive_portal/Makefile
deleted file mode 100644
index 8b1eca9313..0000000000
--- a/examples/protocols/http_server/captive_portal/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := captive_portal
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/protocols/http_server/captive_portal/main/component.mk b/examples/protocols/http_server/captive_portal/main/component.mk
deleted file mode 100644
index 178849a573..0000000000
--- a/examples/protocols/http_server/captive_portal/main/component.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
-
-COMPONENT_EMBED_FILES := root.html
diff --git a/examples/protocols/http_server/file_serving/Makefile b/examples/protocols/http_server/file_serving/Makefile
deleted file mode 100644
index a1b5c46d99..0000000000
--- a/examples/protocols/http_server/file_serving/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := file_server
-
-EXTRA_COMPONENT_DIRS = $(IDF_PATH)/examples/common_components/protocol_examples_common
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/protocols/http_server/file_serving/main/component.mk b/examples/protocols/http_server/file_serving/main/component.mk
deleted file mode 100644
index 539b9ac1d9..0000000000
--- a/examples/protocols/http_server/file_serving/main/component.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
-
-COMPONENT_EMBED_FILES := favicon.ico
-COMPONENT_EMBED_FILES += upload_script.html
diff --git a/examples/protocols/http_server/persistent_sockets/Makefile b/examples/protocols/http_server/persistent_sockets/Makefile
deleted file mode 100644
index d588fe6ac8..0000000000
--- a/examples/protocols/http_server/persistent_sockets/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := persistent_sockets
-
-EXTRA_COMPONENT_DIRS = $(IDF_PATH)/examples/common_components/protocol_examples_common
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/protocols/http_server/persistent_sockets/main/component.mk b/examples/protocols/http_server/persistent_sockets/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/protocols/http_server/persistent_sockets/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/protocols/http_server/restful_server/Makefile b/examples/protocols/http_server/restful_server/Makefile
deleted file mode 100644
index ba534aed17..0000000000
--- a/examples/protocols/http_server/restful_server/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-PROJECT_NAME := restful_server
-
-EXTRA_COMPONENT_DIRS = $(IDF_PATH)/examples/common_components/protocol_examples_common
-
-include $(IDF_PATH)/make/project.mk
-
-ifdef CONFIG_EXAMPLE_WEB_DEPLOY_SF
-WEB_SRC_DIR = $(shell pwd)/front/web-demo
-ifneq ($(wildcard $(WEB_SRC_DIR)/dist/.*),)
-SPIFFS_IMAGE_FLASH_IN_PROJECT := 1
-$(eval $(call spiffs_create_partition_image,www,$(WEB_SRC_DIR)/dist))
-else
-$(error $(WEB_SRC_DIR)/dist doesn't exist. Please run 'npm run build' in $(WEB_SRC_DIR))
-endif
-endif
diff --git a/examples/protocols/http_server/restful_server/main/component.mk b/examples/protocols/http_server/restful_server/main/component.mk
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/examples/protocols/http_server/simple/Makefile b/examples/protocols/http_server/simple/Makefile
deleted file mode 100644
index a770986d6c..0000000000
--- a/examples/protocols/http_server/simple/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := simple
-
-EXTRA_COMPONENT_DIRS = $(IDF_PATH)/examples/common_components/protocol_examples_common
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/protocols/http_server/simple/main/component.mk b/examples/protocols/http_server/simple/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/protocols/http_server/simple/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/protocols/http_server/ws_echo_server/Makefile b/examples/protocols/http_server/ws_echo_server/Makefile
deleted file mode 100644
index 6efb79dcb4..0000000000
--- a/examples/protocols/http_server/ws_echo_server/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := ws_echo_server
-
-EXTRA_COMPONENT_DIRS = $(IDF_PATH)/examples/common_components/protocol_examples_common
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/protocols/http_server/ws_echo_server/main/component.mk b/examples/protocols/http_server/ws_echo_server/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/protocols/http_server/ws_echo_server/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/protocols/https_mbedtls/Makefile b/examples/protocols/https_mbedtls/Makefile
deleted file mode 100644
index b42179ff32..0000000000
--- a/examples/protocols/https_mbedtls/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := https_mbedtls
-
-EXTRA_COMPONENT_DIRS = $(IDF_PATH)/examples/common_components/protocol_examples_common
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/protocols/https_mbedtls/main/component.mk b/examples/protocols/https_mbedtls/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/protocols/https_mbedtls/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/protocols/https_request/Makefile b/examples/protocols/https_request/Makefile
deleted file mode 100644
index 729577f212..0000000000
--- a/examples/protocols/https_request/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := https_request
-
-EXTRA_COMPONENT_DIRS = $(IDF_PATH)/examples/common_components/protocol_examples_common
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/protocols/https_request/main/component.mk b/examples/protocols/https_request/main/component.mk
deleted file mode 100644
index 12acf9fa36..0000000000
--- a/examples/protocols/https_request/main/component.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
-COMPONENT_EMBED_TXTFILES := server_root_cert.pem
diff --git a/examples/protocols/https_server/simple/Makefile b/examples/protocols/https_server/simple/Makefile
deleted file mode 100644
index aa6513d957..0000000000
--- a/examples/protocols/https_server/simple/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := https_server
-
-EXTRA_COMPONENT_DIRS = $(IDF_PATH)/examples/common_components/protocol_examples_common
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/protocols/https_server/simple/main/component.mk b/examples/protocols/https_server/simple/main/component.mk
deleted file mode 100644
index b120d66e5e..0000000000
--- a/examples/protocols/https_server/simple/main/component.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
-
-COMPONENT_EMBED_TXTFILES := certs/cacert.pem
-COMPONENT_EMBED_TXTFILES += certs/prvtkey.pem
diff --git a/examples/protocols/https_server/wss_server/Makefile b/examples/protocols/https_server/wss_server/Makefile
deleted file mode 100644
index 1f777796c0..0000000000
--- a/examples/protocols/https_server/wss_server/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := wss_server
-
-EXTRA_COMPONENT_DIRS = $(IDF_PATH)/examples/common_components/protocol_examples_common
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/protocols/https_server/wss_server/main/component.mk b/examples/protocols/https_server/wss_server/main/component.mk
deleted file mode 100644
index b120d66e5e..0000000000
--- a/examples/protocols/https_server/wss_server/main/component.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
-
-COMPONENT_EMBED_TXTFILES := certs/cacert.pem
-COMPONENT_EMBED_TXTFILES += certs/prvtkey.pem
diff --git a/examples/protocols/https_x509_bundle/Makefile b/examples/protocols/https_x509_bundle/Makefile
deleted file mode 100644
index c4027b2d60..0000000000
--- a/examples/protocols/https_x509_bundle/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := https_x509_bundle
-
-EXTRA_COMPONENT_DIRS = $(IDF_PATH)/examples/common_components/protocol_examples_common
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/protocols/https_x509_bundle/main/component.mk b/examples/protocols/https_x509_bundle/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/protocols/https_x509_bundle/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/protocols/icmp_echo/Makefile b/examples/protocols/icmp_echo/Makefile
deleted file mode 100644
index cd4d70f77e..0000000000
--- a/examples/protocols/icmp_echo/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := icmp_echo
-
-EXTRA_COMPONENT_DIRS = $(IDF_PATH)/examples/common_components/protocol_examples_common
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/protocols/icmp_echo/main/component.mk b/examples/protocols/icmp_echo/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/protocols/icmp_echo/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/protocols/mdns/Makefile b/examples/protocols/mdns/Makefile
deleted file mode 100644
index 90408709d3..0000000000
--- a/examples/protocols/mdns/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := mdns_test
-
-EXTRA_COMPONENT_DIRS = $(IDF_PATH)/examples/common_components/protocol_examples_common
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/protocols/mdns/main/component.mk b/examples/protocols/mdns/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/protocols/mdns/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/protocols/modbus/mb_example_common/component.mk b/examples/protocols/modbus/mb_example_common/component.mk
deleted file mode 100644
index f0dc18cceb..0000000000
--- a/examples/protocols/modbus/mb_example_common/component.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Component Makefile
-#
-COMPONENT_ADD_INCLUDEDIRS := include
-COMPONENT_SRCDIRS := .
diff --git a/examples/protocols/modbus/serial/mb_master/Makefile b/examples/protocols/modbus/serial/mb_master/Makefile
deleted file mode 100644
index 458a97bca7..0000000000
--- a/examples/protocols/modbus/serial/mb_master/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := modbus_master
-
-EXTRA_COMPONENT_DIRS := $(IDF_PATH)/examples/protocols/modbus/mb_example_common
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/protocols/modbus/serial/mb_master/main/component.mk b/examples/protocols/modbus/serial/mb_master/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/protocols/modbus/serial/mb_master/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/protocols/modbus/serial/mb_slave/Makefile b/examples/protocols/modbus/serial/mb_slave/Makefile
deleted file mode 100644
index c3aa218cf1..0000000000
--- a/examples/protocols/modbus/serial/mb_slave/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := modbus_slave
-
-EXTRA_COMPONENT_DIRS := $(IDF_PATH)/examples/protocols/modbus/mb_example_common
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/protocols/modbus/serial/mb_slave/main/component.mk b/examples/protocols/modbus/serial/mb_slave/main/component.mk
deleted file mode 100644
index b4fa72791c..0000000000
--- a/examples/protocols/modbus/serial/mb_slave/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# Main Makefile. This is basically the same as a component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/protocols/modbus/tcp/mb_tcp_master/Makefile b/examples/protocols/modbus/tcp/mb_tcp_master/Makefile
deleted file mode 100644
index 1f60bf1c18..0000000000
--- a/examples/protocols/modbus/tcp/mb_tcp_master/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := modbus_tcp_master
-
-EXTRA_COMPONENT_DIRS := $(IDF_PATH)/examples/protocols/modbus/mb_example_common
-EXTRA_COMPONENT_DIRS += $(IDF_PATH)/examples/common_components/protocol_examples_common
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/protocols/modbus/tcp/mb_tcp_master/main/component.mk b/examples/protocols/modbus/tcp/mb_tcp_master/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/protocols/modbus/tcp/mb_tcp_master/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/protocols/modbus/tcp/mb_tcp_slave/Makefile b/examples/protocols/modbus/tcp/mb_tcp_slave/Makefile
deleted file mode 100644
index 892d758c41..0000000000
--- a/examples/protocols/modbus/tcp/mb_tcp_slave/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-PROJECT_NAME := modbus_tcp_slave
-
-EXTRA_COMPONENT_DIRS := $(IDF_PATH)/examples/protocols/modbus/mb_example_common
-EXTRA_COMPONENT_DIRS += $(IDF_PATH)/examples/common_components/protocol_examples_common
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/protocols/modbus/tcp/mb_tcp_slave/main/component.mk b/examples/protocols/modbus/tcp/mb_tcp_slave/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/protocols/modbus/tcp/mb_tcp_slave/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/protocols/mqtt/ssl/Makefile b/examples/protocols/mqtt/ssl/Makefile
deleted file mode 100644
index efe7f7d572..0000000000
--- a/examples/protocols/mqtt/ssl/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-PROJECT_NAME := mqtt_ssl
-
-EXTRA_COMPONENT_DIRS = $(IDF_PATH)/examples/common_components/protocol_examples_common
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/protocols/mqtt/ssl/main/component.mk b/examples/protocols/mqtt/ssl/main/component.mk
deleted file mode 100644
index c0c0f87e68..0000000000
--- a/examples/protocols/mqtt/ssl/main/component.mk
+++ /dev/null
@@ -1 +0,0 @@
-COMPONENT_EMBED_TXTFILES := mqtt_eclipseprojects_io.pem
diff --git a/examples/protocols/mqtt/ssl_mutual_auth/Makefile b/examples/protocols/mqtt/ssl_mutual_auth/Makefile
deleted file mode 100644
index 1394f99a6c..0000000000
--- a/examples/protocols/mqtt/ssl_mutual_auth/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-PROJECT_NAME := mqtt_ssl_mutual_auth
-
-EXTRA_COMPONENT_DIRS = $(IDF_PATH)/examples/common_components/protocol_examples_common
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/protocols/mqtt/ssl_mutual_auth/main/component.mk b/examples/protocols/mqtt/ssl_mutual_auth/main/component.mk
deleted file mode 100644
index aaed44c81f..0000000000
--- a/examples/protocols/mqtt/ssl_mutual_auth/main/component.mk
+++ /dev/null
@@ -1 +0,0 @@
-COMPONENT_EMBED_TXTFILES := client.crt client.key mosquitto.org.crt
diff --git a/examples/protocols/mqtt/ssl_psk/Makefile b/examples/protocols/mqtt/ssl_psk/Makefile
deleted file mode 100644
index 24bec17e9d..0000000000
--- a/examples/protocols/mqtt/ssl_psk/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-PROJECT_NAME := mqtt_ssl_psk
-
-EXTRA_COMPONENT_DIRS = $(IDF_PATH)/examples/common_components/protocol_examples_common
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/protocols/mqtt/ssl_psk/main/component.mk b/examples/protocols/mqtt/ssl_psk/main/component.mk
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/examples/protocols/mqtt/tcp/Makefile b/examples/protocols/mqtt/tcp/Makefile
deleted file mode 100644
index 530276501d..0000000000
--- a/examples/protocols/mqtt/tcp/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-PROJECT_NAME := mqtt_tcp
-
-EXTRA_COMPONENT_DIRS = $(IDF_PATH)/examples/common_components/protocol_examples_common
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/protocols/mqtt/tcp/main/component.mk b/examples/protocols/mqtt/tcp/main/component.mk
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/examples/protocols/mqtt/ws/Makefile b/examples/protocols/mqtt/ws/Makefile
deleted file mode 100644
index 2b97fa44c9..0000000000
--- a/examples/protocols/mqtt/ws/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-PROJECT_NAME := mqtt_websocket
-
-EXTRA_COMPONENT_DIRS = $(IDF_PATH)/examples/common_components/protocol_examples_common
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/protocols/mqtt/ws/main/component.mk b/examples/protocols/mqtt/ws/main/component.mk
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/examples/protocols/mqtt/wss/Makefile b/examples/protocols/mqtt/wss/Makefile
deleted file mode 100644
index 50ed13dd38..0000000000
--- a/examples/protocols/mqtt/wss/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-PROJECT_NAME := mqtt_websocket_secure
-
-EXTRA_COMPONENT_DIRS = $(IDF_PATH)/examples/common_components/protocol_examples_common
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/protocols/mqtt/wss/main/component.mk b/examples/protocols/mqtt/wss/main/component.mk
deleted file mode 100644
index c0c0f87e68..0000000000
--- a/examples/protocols/mqtt/wss/main/component.mk
+++ /dev/null
@@ -1 +0,0 @@
-COMPONENT_EMBED_TXTFILES := mqtt_eclipseprojects_io.pem
diff --git a/examples/protocols/pppos_client/Makefile b/examples/protocols/pppos_client/Makefile
deleted file mode 100644
index c6485ad525..0000000000
--- a/examples/protocols/pppos_client/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := pppos_client
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/protocols/pppos_client/components/modem/component.mk b/examples/protocols/pppos_client/components/modem/component.mk
deleted file mode 100644
index 33f4c6039d..0000000000
--- a/examples/protocols/pppos_client/components/modem/component.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-COMPONENT_ADD_INCLUDEDIRS := include
-COMPONENT_SRCDIRS := src
diff --git a/examples/protocols/pppos_client/main/component.mk b/examples/protocols/pppos_client/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/protocols/pppos_client/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/protocols/slip/slip_udp/Makefile b/examples/protocols/slip/slip_udp/Makefile
deleted file mode 100644
index 866b3d6ae6..0000000000
--- a/examples/protocols/slip/slip_udp/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := slip_client
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/protocols/slip/slip_udp/components/slip_modem/component.mk b/examples/protocols/slip/slip_udp/components/slip_modem/component.mk
deleted file mode 100644
index b9a426049f..0000000000
--- a/examples/protocols/slip/slip_udp/components/slip_modem/component.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-COMPONENT_ADD_INCLUDEDIRS := include
-
-COMPONENT_SRCDIRS := library
diff --git a/examples/protocols/slip/slip_udp/main/component.mk b/examples/protocols/slip/slip_udp/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/protocols/slip/slip_udp/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/protocols/smtp_client/Makefile b/examples/protocols/smtp_client/Makefile
deleted file mode 100644
index b0d979618a..0000000000
--- a/examples/protocols/smtp_client/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := smtp_client
-
-EXTRA_COMPONENT_DIRS = $(IDF_PATH)/examples/common_components/protocol_examples_common
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/protocols/smtp_client/main/component.mk b/examples/protocols/smtp_client/main/component.mk
deleted file mode 100644
index f52e1c7db4..0000000000
--- a/examples/protocols/smtp_client/main/component.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Main Makefile. This is basically the same as a component makefile.
-#
-
-COMPONENT_EMBED_TXTFILES := server_root_cert.pem esp_logo.png
diff --git a/examples/protocols/sntp/Makefile b/examples/protocols/sntp/Makefile
deleted file mode 100644
index 7ece4e2076..0000000000
--- a/examples/protocols/sntp/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := sntp
-
-EXTRA_COMPONENT_DIRS = $(IDF_PATH)/examples/common_components/protocol_examples_common
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/protocols/sntp/main/component.mk b/examples/protocols/sntp/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/protocols/sntp/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/protocols/sockets/non_blocking/Makefile b/examples/protocols/sockets/non_blocking/Makefile
deleted file mode 100644
index d430b892f6..0000000000
--- a/examples/protocols/sockets/non_blocking/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := non_blocking_socket
-
-EXTRA_COMPONENT_DIRS = $(IDF_PATH)/examples/common_components/protocol_examples_common
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/protocols/sockets/non_blocking/main/component.mk b/examples/protocols/sockets/non_blocking/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/protocols/sockets/non_blocking/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/protocols/sockets/tcp_client/Makefile b/examples/protocols/sockets/tcp_client/Makefile
deleted file mode 100644
index 87f4bb92f7..0000000000
--- a/examples/protocols/sockets/tcp_client/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := tcp_client
-
-EXTRA_COMPONENT_DIRS = $(IDF_PATH)/examples/common_components/protocol_examples_common
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/protocols/sockets/tcp_client/main/component.mk b/examples/protocols/sockets/tcp_client/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/protocols/sockets/tcp_client/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/protocols/sockets/tcp_client_multi_net/Makefile b/examples/protocols/sockets/tcp_client_multi_net/Makefile
deleted file mode 100644
index 7b03a4e849..0000000000
--- a/examples/protocols/sockets/tcp_client_multi_net/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := tcp_client_multiple
-
-EXTRA_COMPONENT_DIRS = $(IDF_PATH)/examples/common_components/protocol_examples_common
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/protocols/sockets/tcp_client_multi_net/main/component.mk b/examples/protocols/sockets/tcp_client_multi_net/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/protocols/sockets/tcp_client_multi_net/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/protocols/sockets/tcp_server/Makefile b/examples/protocols/sockets/tcp_server/Makefile
deleted file mode 100644
index 318e78a775..0000000000
--- a/examples/protocols/sockets/tcp_server/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := tcp_server
-
-EXTRA_COMPONENT_DIRS = $(IDF_PATH)/examples/common_components/protocol_examples_common
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/protocols/sockets/tcp_server/main/component.mk b/examples/protocols/sockets/tcp_server/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/protocols/sockets/tcp_server/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/protocols/sockets/udp_client/Makefile b/examples/protocols/sockets/udp_client/Makefile
deleted file mode 100644
index cd4cfec658..0000000000
--- a/examples/protocols/sockets/udp_client/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := udp_client
-
-EXTRA_COMPONENT_DIRS = $(IDF_PATH)/examples/common_components/protocol_examples_common
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/protocols/sockets/udp_client/main/component.mk b/examples/protocols/sockets/udp_client/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/protocols/sockets/udp_client/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/protocols/sockets/udp_multicast/Makefile b/examples/protocols/sockets/udp_multicast/Makefile
deleted file mode 100644
index 7a58fcba65..0000000000
--- a/examples/protocols/sockets/udp_multicast/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := udp_multicast
-
-EXTRA_COMPONENT_DIRS = $(IDF_PATH)/examples/common_components/protocol_examples_common
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/protocols/sockets/udp_multicast/main/component.mk b/examples/protocols/sockets/udp_multicast/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/protocols/sockets/udp_multicast/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/protocols/sockets/udp_server/Makefile b/examples/protocols/sockets/udp_server/Makefile
deleted file mode 100644
index 84387b7584..0000000000
--- a/examples/protocols/sockets/udp_server/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := udp_server
-
-EXTRA_COMPONENT_DIRS = $(IDF_PATH)/examples/common_components/protocol_examples_common
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/protocols/sockets/udp_server/main/component.mk b/examples/protocols/sockets/udp_server/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/protocols/sockets/udp_server/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/protocols/static_ip/Makefile b/examples/protocols/static_ip/Makefile
deleted file mode 100644
index bd2c6fc15a..0000000000
--- a/examples/protocols/static_ip/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := static_ip
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/protocols/static_ip/main/component.mk b/examples/protocols/static_ip/main/component.mk
deleted file mode 100644
index 0adf45649a..0000000000
--- a/examples/protocols/static_ip/main/component.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Main component makefile.
-#
-# This Makefile can be left empty. By default, it will take the sources in the
-# src/ directory, compile them and link them into lib(subdirectory_name).a
-# in the build directory. This behaviour is entirely configurable,
-# please read the ESP-IDF documents if you need to do this.
-#
diff --git a/examples/protocols/websocket/Makefile b/examples/protocols/websocket/Makefile
deleted file mode 100644
index 9c0adb31c9..0000000000
--- a/examples/protocols/websocket/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-PROJECT_NAME := websocket_example
-
-EXTRA_COMPONENT_DIRS = $(IDF_PATH)/examples/common_components/protocol_examples_common
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/protocols/websocket/main/component.mk b/examples/protocols/websocket/main/component.mk
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/examples/provisioning/legacy/ble_prov/Makefile b/examples/provisioning/legacy/ble_prov/Makefile
deleted file mode 100644
index 2cfa6583d6..0000000000
--- a/examples/provisioning/legacy/ble_prov/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := ble_prov
-EXTRA_COMPONENT_DIRS = $(IDF_PATH)/examples/common_components/qrcode
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/provisioning/legacy/ble_prov/main/component.mk b/examples/provisioning/legacy/ble_prov/main/component.mk
deleted file mode 100644
index 0adf45649a..0000000000
--- a/examples/provisioning/legacy/ble_prov/main/component.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Main component makefile.
-#
-# This Makefile can be left empty. By default, it will take the sources in the
-# src/ directory, compile them and link them into lib(subdirectory_name).a
-# in the build directory. This behaviour is entirely configurable,
-# please read the ESP-IDF documents if you need to do this.
-#
diff --git a/examples/provisioning/legacy/console_prov/Makefile b/examples/provisioning/legacy/console_prov/Makefile
deleted file mode 100644
index 28bd515588..0000000000
--- a/examples/provisioning/legacy/console_prov/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := console_prov
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/provisioning/legacy/console_prov/main/component.mk b/examples/provisioning/legacy/console_prov/main/component.mk
deleted file mode 100644
index 0adf45649a..0000000000
--- a/examples/provisioning/legacy/console_prov/main/component.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Main component makefile.
-#
-# This Makefile can be left empty. By default, it will take the sources in the
-# src/ directory, compile them and link them into lib(subdirectory_name).a
-# in the build directory. This behaviour is entirely configurable,
-# please read the ESP-IDF documents if you need to do this.
-#
diff --git a/examples/provisioning/legacy/custom_config/Makefile b/examples/provisioning/legacy/custom_config/Makefile
deleted file mode 100644
index 40cfa8c2e0..0000000000
--- a/examples/provisioning/legacy/custom_config/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := custom_config
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/provisioning/legacy/custom_config/components/custom_provisioning/component.mk b/examples/provisioning/legacy/custom_config/components/custom_provisioning/component.mk
deleted file mode 100644
index 69af7efdf3..0000000000
--- a/examples/provisioning/legacy/custom_config/components/custom_provisioning/component.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-COMPONENT_SRCDIRS := src proto-c
-COMPONENT_ADD_INCLUDEDIRS := include
-COMPONENT_PRIV_INCLUDEDIRS := proto-c
diff --git a/examples/provisioning/legacy/custom_config/main/component.mk b/examples/provisioning/legacy/custom_config/main/component.mk
deleted file mode 100644
index 0adf45649a..0000000000
--- a/examples/provisioning/legacy/custom_config/main/component.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Main component makefile.
-#
-# This Makefile can be left empty. By default, it will take the sources in the
-# src/ directory, compile them and link them into lib(subdirectory_name).a
-# in the build directory. This behaviour is entirely configurable,
-# please read the ESP-IDF documents if you need to do this.
-#
diff --git a/examples/provisioning/legacy/softap_prov/Makefile b/examples/provisioning/legacy/softap_prov/Makefile
deleted file mode 100644
index 371d2373fb..0000000000
--- a/examples/provisioning/legacy/softap_prov/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := softap_prov
-EXTRA_COMPONENT_DIRS = $(IDF_PATH)/examples/common_components/qrcode
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/provisioning/legacy/softap_prov/main/component.mk b/examples/provisioning/legacy/softap_prov/main/component.mk
deleted file mode 100644
index 0adf45649a..0000000000
--- a/examples/provisioning/legacy/softap_prov/main/component.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Main component makefile.
-#
-# This Makefile can be left empty. By default, it will take the sources in the
-# src/ directory, compile them and link them into lib(subdirectory_name).a
-# in the build directory. This behaviour is entirely configurable,
-# please read the ESP-IDF documents if you need to do this.
-#
diff --git a/examples/provisioning/wifi_prov_mgr/Makefile b/examples/provisioning/wifi_prov_mgr/Makefile
deleted file mode 100644
index daf801980d..0000000000
--- a/examples/provisioning/wifi_prov_mgr/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := wifi_prov_mgr
-EXTRA_COMPONENT_DIRS = $(IDF_PATH)/examples/common_components/qrcode
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/provisioning/wifi_prov_mgr/main/component.mk b/examples/provisioning/wifi_prov_mgr/main/component.mk
deleted file mode 100644
index 0adf45649a..0000000000
--- a/examples/provisioning/wifi_prov_mgr/main/component.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Main component makefile.
-#
-# This Makefile can be left empty. By default, it will take the sources in the
-# src/ directory, compile them and link them into lib(subdirectory_name).a
-# in the build directory. This behaviour is entirely configurable,
-# please read the ESP-IDF documents if you need to do this.
-#
diff --git a/examples/security/flash_encryption/Makefile b/examples/security/flash_encryption/Makefile
deleted file mode 100644
index fbb95949f7..0000000000
--- a/examples/security/flash_encryption/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := flash-encryption
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/security/flash_encryption/main/component.mk b/examples/security/flash_encryption/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/security/flash_encryption/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/storage/custom_flash_driver/Makefile b/examples/storage/custom_flash_driver/Makefile
deleted file mode 100644
index e92c2d77ac..0000000000
--- a/examples/storage/custom_flash_driver/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := custom_flash_driver
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/storage/custom_flash_driver/components/custom_chip_driver/component.mk b/examples/storage/custom_flash_driver/components/custom_chip_driver/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/storage/custom_flash_driver/components/custom_chip_driver/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/storage/custom_flash_driver/main/component.mk b/examples/storage/custom_flash_driver/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/storage/custom_flash_driver/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/storage/ext_flash_fatfs/Makefile b/examples/storage/ext_flash_fatfs/Makefile
deleted file mode 100644
index d1cdc7942f..0000000000
--- a/examples/storage/ext_flash_fatfs/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := ext_flash_fatfs
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/storage/ext_flash_fatfs/main/component.mk b/examples/storage/ext_flash_fatfs/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/storage/ext_flash_fatfs/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/storage/nvs_rw_blob/Makefile b/examples/storage/nvs_rw_blob/Makefile
deleted file mode 100644
index 8e97652c25..0000000000
--- a/examples/storage/nvs_rw_blob/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := nvs_rw_blob
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/storage/nvs_rw_blob/main/component.mk b/examples/storage/nvs_rw_blob/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/storage/nvs_rw_blob/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/storage/nvs_rw_value/Makefile b/examples/storage/nvs_rw_value/Makefile
deleted file mode 100644
index b6fcef6fcd..0000000000
--- a/examples/storage/nvs_rw_value/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := nvs_rw_value
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/storage/nvs_rw_value/main/component.mk b/examples/storage/nvs_rw_value/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/storage/nvs_rw_value/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/storage/nvs_rw_value_cxx/Makefile b/examples/storage/nvs_rw_value_cxx/Makefile
deleted file mode 100644
index cde06e4a4f..0000000000
--- a/examples/storage/nvs_rw_value_cxx/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := nvs_rw_value_cxx
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/storage/nvs_rw_value_cxx/main/component.mk b/examples/storage/nvs_rw_value_cxx/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/storage/nvs_rw_value_cxx/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/storage/partition_api/partition_find/Makefile b/examples/storage/partition_api/partition_find/Makefile
deleted file mode 100644
index 36280c1062..0000000000
--- a/examples/storage/partition_api/partition_find/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := partition_find
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/storage/partition_api/partition_find/main/component.mk b/examples/storage/partition_api/partition_find/main/component.mk
deleted file mode 100644
index c86b2bc41f..0000000000
--- a/examples/storage/partition_api/partition_find/main/component.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# Main component makefile.
-#
-# This Makefile can be left empty. By default, it will take the sources in the
-# src/ directory, compile them and link them into lib(subdirectory_name).a
-# in the build directory. This behaviour is entirely configurable,
-# please read the ESP-IDF documents if you need to do this.
-#
-
-COMPONENT_EMBED_TXTFILES := ../partitions_example.csv
diff --git a/examples/storage/partition_api/partition_mmap/Makefile b/examples/storage/partition_api/partition_mmap/Makefile
deleted file mode 100644
index 998913fdc7..0000000000
--- a/examples/storage/partition_api/partition_mmap/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := partition_mmap
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/storage/partition_api/partition_mmap/main/component.mk b/examples/storage/partition_api/partition_mmap/main/component.mk
deleted file mode 100644
index 0adf45649a..0000000000
--- a/examples/storage/partition_api/partition_mmap/main/component.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Main component makefile.
-#
-# This Makefile can be left empty. By default, it will take the sources in the
-# src/ directory, compile them and link them into lib(subdirectory_name).a
-# in the build directory. This behaviour is entirely configurable,
-# please read the ESP-IDF documents if you need to do this.
-#
diff --git a/examples/storage/partition_api/partition_ops/Makefile b/examples/storage/partition_api/partition_ops/Makefile
deleted file mode 100644
index 2da9b02091..0000000000
--- a/examples/storage/partition_api/partition_ops/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := partition_ops
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/storage/partition_api/partition_ops/main/component.mk b/examples/storage/partition_api/partition_ops/main/component.mk
deleted file mode 100644
index 0adf45649a..0000000000
--- a/examples/storage/partition_api/partition_ops/main/component.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Main component makefile.
-#
-# This Makefile can be left empty. By default, it will take the sources in the
-# src/ directory, compile them and link them into lib(subdirectory_name).a
-# in the build directory. This behaviour is entirely configurable,
-# please read the ESP-IDF documents if you need to do this.
-#
diff --git a/examples/storage/parttool/Makefile b/examples/storage/parttool/Makefile
deleted file mode 100644
index 7d37af62e4..0000000000
--- a/examples/storage/parttool/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := parttool
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/storage/parttool/main/component.mk b/examples/storage/parttool/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/storage/parttool/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/storage/sd_card/sdmmc/Makefile b/examples/storage/sd_card/sdmmc/Makefile
deleted file mode 100644
index 2d047609a9..0000000000
--- a/examples/storage/sd_card/sdmmc/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := sd_card
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/storage/sd_card/sdmmc/main/component.mk b/examples/storage/sd_card/sdmmc/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/storage/sd_card/sdmmc/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/storage/sd_card/sdspi/Makefile b/examples/storage/sd_card/sdspi/Makefile
deleted file mode 100644
index 2d047609a9..0000000000
--- a/examples/storage/sd_card/sdspi/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := sd_card
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/storage/sd_card/sdspi/main/component.mk b/examples/storage/sd_card/sdspi/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/storage/sd_card/sdspi/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/storage/semihost_vfs/Makefile b/examples/storage/semihost_vfs/Makefile
deleted file mode 100644
index efb32e08e4..0000000000
--- a/examples/storage/semihost_vfs/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := semihost_vfs
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/storage/semihost_vfs/main/component.mk b/examples/storage/semihost_vfs/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/storage/semihost_vfs/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/storage/spiffs/Makefile b/examples/storage/spiffs/Makefile
deleted file mode 100644
index 97f63890d7..0000000000
--- a/examples/storage/spiffs/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := spiffs
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/storage/spiffs/main/component.mk b/examples/storage/spiffs/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/storage/spiffs/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/storage/spiffsgen/Makefile b/examples/storage/spiffsgen/Makefile
deleted file mode 100644
index dbc12b3760..0000000000
--- a/examples/storage/spiffsgen/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := spiffsgen
-
-include $(IDF_PATH)/make/project.mk
-
-# Create a SPIFFS image from the contents of the 'spiffs_image' directory
-# that fits the partition named 'storage'. FLASH_IN_PROJECT indicates that
-# the generated image should be flashed when the entire project is flashed to
-# the target with 'make flash'.
-SPIFFS_IMAGE_FLASH_IN_PROJECT := 1
-$(eval $(call spiffs_create_partition_image,storage,spiffs_image))
diff --git a/examples/storage/spiffsgen/main/component.mk b/examples/storage/spiffsgen/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/storage/spiffsgen/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/storage/wear_levelling/Makefile b/examples/storage/wear_levelling/Makefile
deleted file mode 100644
index 0ebb5bebff..0000000000
--- a/examples/storage/wear_levelling/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := wear_levelling_example
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/storage/wear_levelling/main/component.mk b/examples/storage/wear_levelling/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/storage/wear_levelling/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/system/app_trace_to_host/Makefile b/examples/system/app_trace_to_host/Makefile
deleted file mode 100644
index 5bf1ddc0f4..0000000000
--- a/examples/system/app_trace_to_host/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := app_trace_to_host
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/system/app_trace_to_host/main/component.mk b/examples/system/app_trace_to_host/main/component.mk
deleted file mode 100644
index 44bd2b5273..0000000000
--- a/examples/system/app_trace_to_host/main/component.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-#
-# Main Makefile. This is basically the same as a component makefile.
-#
diff --git a/examples/system/base_mac_address/Makefile b/examples/system/base_mac_address/Makefile
deleted file mode 100644
index 2549aebc53..0000000000
--- a/examples/system/base_mac_address/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := base_mac_address
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/system/base_mac_address/main/component.mk b/examples/system/base_mac_address/main/component.mk
deleted file mode 100644
index 44bd2b5273..0000000000
--- a/examples/system/base_mac_address/main/component.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-#
-# Main Makefile. This is basically the same as a component makefile.
-#
diff --git a/examples/system/console/advanced/Makefile b/examples/system/console/advanced/Makefile
deleted file mode 100644
index 70f372194a..0000000000
--- a/examples/system/console/advanced/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := console
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/system/console/advanced/components/cmd_nvs/component.mk b/examples/system/console/advanced/components/cmd_nvs/component.mk
deleted file mode 100644
index e0e9f4c128..0000000000
--- a/examples/system/console/advanced/components/cmd_nvs/component.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# Component Makefile
-#
-# This Makefile should, at the very least, just include $(SDK_PATH)/Makefile. By default,
-# this will take the sources in the src/ directory, compile them and link them into
-# lib(subdirectory_name).a in the build directory. This behaviour is entirely configurable,
-# please read the SDK documents if you need to do this.
-#
-
-COMPONENT_ADD_INCLUDEDIRS := .
diff --git a/examples/system/console/advanced/components/cmd_system/component.mk b/examples/system/console/advanced/components/cmd_system/component.mk
deleted file mode 100644
index e0e9f4c128..0000000000
--- a/examples/system/console/advanced/components/cmd_system/component.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# Component Makefile
-#
-# This Makefile should, at the very least, just include $(SDK_PATH)/Makefile. By default,
-# this will take the sources in the src/ directory, compile them and link them into
-# lib(subdirectory_name).a in the build directory. This behaviour is entirely configurable,
-# please read the SDK documents if you need to do this.
-#
-
-COMPONENT_ADD_INCLUDEDIRS := .
diff --git a/examples/system/console/advanced/main/component.mk b/examples/system/console/advanced/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/system/console/advanced/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/system/console/basic/Makefile b/examples/system/console/basic/Makefile
deleted file mode 100644
index 2a34419b48..0000000000
--- a/examples/system/console/basic/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := console
-
-EXTRA_COMPONENT_DIRS := $(IDF_PATH)/examples/system/console/advanced/components
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/system/console/basic/main/component.mk b/examples/system/console/basic/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/system/console/basic/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/system/deep_sleep/Makefile b/examples/system/deep_sleep/Makefile
deleted file mode 100644
index b9c7eee00a..0000000000
--- a/examples/system/deep_sleep/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := deep_sleep
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/system/deep_sleep/main/component.mk b/examples/system/deep_sleep/main/component.mk
deleted file mode 100644
index 44bd2b5273..0000000000
--- a/examples/system/deep_sleep/main/component.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-#
-# Main Makefile. This is basically the same as a component makefile.
-#
diff --git a/examples/system/efuse/Makefile b/examples/system/efuse/Makefile
deleted file mode 100644
index 64ca21fc65..0000000000
--- a/examples/system/efuse/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := efuse
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/system/efuse/main/component.mk b/examples/system/efuse/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/system/efuse/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/system/esp_event/default_event_loop/Makefile b/examples/system/esp_event/default_event_loop/Makefile
deleted file mode 100644
index f15f53eac1..0000000000
--- a/examples/system/esp_event/default_event_loop/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := default_event_loop
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/system/esp_event/default_event_loop/main/component.mk b/examples/system/esp_event/default_event_loop/main/component.mk
deleted file mode 100644
index 0adf45649a..0000000000
--- a/examples/system/esp_event/default_event_loop/main/component.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Main component makefile.
-#
-# This Makefile can be left empty. By default, it will take the sources in the
-# src/ directory, compile them and link them into lib(subdirectory_name).a
-# in the build directory. This behaviour is entirely configurable,
-# please read the ESP-IDF documents if you need to do this.
-#
diff --git a/examples/system/esp_event/user_event_loops/Makefile b/examples/system/esp_event/user_event_loops/Makefile
deleted file mode 100644
index 6c76daf1f1..0000000000
--- a/examples/system/esp_event/user_event_loops/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := user_event_loops
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/system/esp_event/user_event_loops/main/component.mk b/examples/system/esp_event/user_event_loops/main/component.mk
deleted file mode 100644
index 0adf45649a..0000000000
--- a/examples/system/esp_event/user_event_loops/main/component.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Main component makefile.
-#
-# This Makefile can be left empty. By default, it will take the sources in the
-# src/ directory, compile them and link them into lib(subdirectory_name).a
-# in the build directory. This behaviour is entirely configurable,
-# please read the ESP-IDF documents if you need to do this.
-#
diff --git a/examples/system/esp_timer/Makefile b/examples/system/esp_timer/Makefile
deleted file mode 100644
index 4626957fe0..0000000000
--- a/examples/system/esp_timer/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := esp_timer_example
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/system/esp_timer/main/component.mk b/examples/system/esp_timer/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/system/esp_timer/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/system/eventfd/Makefile b/examples/system/eventfd/Makefile
deleted file mode 100644
index c26394d601..0000000000
--- a/examples/system/eventfd/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := eventfd
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/system/eventfd/main/component.mk b/examples/system/eventfd/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/system/eventfd/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/system/freertos/real_time_stats/Makefile b/examples/system/freertos/real_time_stats/Makefile
deleted file mode 100644
index a8751107a5..0000000000
--- a/examples/system/freertos/real_time_stats/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := real_time_stats
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/system/freertos/real_time_stats/main/component.mk b/examples/system/freertos/real_time_stats/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/system/freertos/real_time_stats/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/system/gcov/Makefile b/examples/system/gcov/Makefile
deleted file mode 100644
index 9d8524af9b..0000000000
--- a/examples/system/gcov/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := gcov_example
-
-include $(IDF_PATH)/make/project.mk
-
-GCOV := $(call dequote,$(CONFIG_SDK_TOOLPREFIX))gcov
-REPORT_DIR := $(BUILD_DIR_BASE)/coverage_report
-
-pre-cov-report:
-	echo "Generating coverage report in: $(REPORT_DIR)"
-	echo "Using gcov: $(GCOV)"
-	mkdir -p $(REPORT_DIR)/html
-
-lcov-report: | pre-cov-report
-	echo "WARNING: lcov-report is deprecated. Please use gcovr-report instead."
-	lcov --gcov-tool $(GCOV) -c -d $(BUILD_DIR_BASE) -o $(REPORT_DIR)/$(PROJECT_NAME).info
-	genhtml -o $(REPORT_DIR)/html $(REPORT_DIR)/$(PROJECT_NAME).info
-
-gcovr-report: | check_python_dependencies pre-cov-report
-	cd $(BUILD_DIR_BASE)
-	gcovr -r $(PROJECT_PATH) --gcov-executable $(GCOV) -s --html-details $(REPORT_DIR)/html/index.html
-
-cov-data-clean:
-	echo "Remove coverage data files..."
-	find $(BUILD_DIR_BASE) -name "*.gcda" -exec rm {} +
-	rm -rf $(REPORT_DIR)
-
-.PHONY: lcov-report gcovr-report cov-data-clean
diff --git a/examples/system/gcov/components/sample/component.mk b/examples/system/gcov/components/sample/component.mk
deleted file mode 100644
index ed258eda5a..0000000000
--- a/examples/system/gcov/components/sample/component.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
-
-CFLAGS += --coverage
diff --git a/examples/system/gcov/main/component.mk b/examples/system/gcov/main/component.mk
deleted file mode 100644
index ed258eda5a..0000000000
--- a/examples/system/gcov/main/component.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
-
-CFLAGS += --coverage
diff --git a/examples/system/gdbstub/Makefile b/examples/system/gdbstub/Makefile
deleted file mode 100644
index 6615607b98..0000000000
--- a/examples/system/gdbstub/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := gdbstub
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/system/gdbstub/main/component.mk b/examples/system/gdbstub/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/system/gdbstub/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/system/heap_task_tracking/Makefile b/examples/system/heap_task_tracking/Makefile
deleted file mode 100644
index b4d1eb02b4..0000000000
--- a/examples/system/heap_task_tracking/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := heap_task_tracking
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/system/heap_task_tracking/main/component.mk b/examples/system/heap_task_tracking/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/system/heap_task_tracking/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/system/himem/Makefile b/examples/system/himem/Makefile
deleted file mode 100644
index d723429a19..0000000000
--- a/examples/system/himem/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := himem_test
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/system/himem/main/component.mk b/examples/system/himem/main/component.mk
deleted file mode 100644
index 44bd2b5273..0000000000
--- a/examples/system/himem/main/component.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-#
-# Main Makefile. This is basically the same as a component makefile.
-#
diff --git a/examples/system/ipc/ipc_isr/Makefile b/examples/system/ipc/ipc_isr/Makefile
deleted file mode 100644
index 016ef64a59..0000000000
--- a/examples/system/ipc/ipc_isr/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := ipc_isr
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/system/ipc/ipc_isr/main/component.mk b/examples/system/ipc/ipc_isr/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/system/ipc/ipc_isr/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/system/light_sleep/Makefile b/examples/system/light_sleep/Makefile
deleted file mode 100644
index 9b2858e700..0000000000
--- a/examples/system/light_sleep/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := light_sleep_example
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/system/light_sleep/main/component.mk b/examples/system/light_sleep/main/component.mk
deleted file mode 100644
index 44bd2b5273..0000000000
--- a/examples/system/light_sleep/main/component.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-#
-# Main Makefile. This is basically the same as a component makefile.
-#
diff --git a/examples/system/ota/advanced_https_ota/Makefile b/examples/system/ota/advanced_https_ota/Makefile
deleted file mode 100644
index f5251cecec..0000000000
--- a/examples/system/ota/advanced_https_ota/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := advanced_https_ota
-
-EXTRA_COMPONENT_DIRS = $(IDF_PATH)/examples/common_components/protocol_examples_common
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/system/ota/advanced_https_ota/main/component.mk b/examples/system/ota/advanced_https_ota/main/component.mk
deleted file mode 100644
index 709ef6eb77..0000000000
--- a/examples/system/ota/advanced_https_ota/main/component.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
-
-COMPONENT_EMBED_TXTFILES :=  ${PROJECT_PATH}/server_certs/ca_cert.pem
-
-COMPONENT_ADD_INCLUDEDIRS += ./ble_helper/include
-COMPONENT_SRCDIRS += ./ble_helper/
diff --git a/examples/system/ota/native_ota_example/Makefile b/examples/system/ota/native_ota_example/Makefile
deleted file mode 100644
index 499fbd4fbb..0000000000
--- a/examples/system/ota/native_ota_example/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := native_ota
-
-EXTRA_COMPONENT_DIRS = $(IDF_PATH)/examples/common_components/protocol_examples_common
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/system/ota/native_ota_example/main/component.mk b/examples/system/ota/native_ota_example/main/component.mk
deleted file mode 100644
index 3a1333340d..0000000000
--- a/examples/system/ota/native_ota_example/main/component.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
-
-COMPONENT_EMBED_TXTFILES :=  ${PROJECT_PATH}/server_certs/ca_cert.pem
diff --git a/examples/system/ota/otatool/Makefile b/examples/system/ota/otatool/Makefile
deleted file mode 100644
index b862f0cccb..0000000000
--- a/examples/system/ota/otatool/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := otatool
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/system/ota/otatool/main/component.mk b/examples/system/ota/otatool/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/system/ota/otatool/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/system/ota/simple_ota_example/Makefile b/examples/system/ota/simple_ota_example/Makefile
deleted file mode 100644
index 5f74215f88..0000000000
--- a/examples/system/ota/simple_ota_example/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := simple_ota
-
-EXTRA_COMPONENT_DIRS = $(IDF_PATH)/examples/common_components/protocol_examples_common
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/system/ota/simple_ota_example/main/component.mk b/examples/system/ota/simple_ota_example/main/component.mk
deleted file mode 100644
index 3a1333340d..0000000000
--- a/examples/system/ota/simple_ota_example/main/component.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
-
-COMPONENT_EMBED_TXTFILES :=  ${PROJECT_PATH}/server_certs/ca_cert.pem
diff --git a/examples/system/perfmon/Makefile b/examples/system/perfmon/Makefile
deleted file mode 100644
index f41f4663f9..0000000000
--- a/examples/system/perfmon/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := perfmon_example
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/system/perfmon/main/component.mk b/examples/system/perfmon/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/system/perfmon/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/system/pthread/Makefile b/examples/system/pthread/Makefile
deleted file mode 100644
index 7c8714cccd..0000000000
--- a/examples/system/pthread/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := pthread
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/system/pthread/main/component.mk b/examples/system/pthread/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/system/pthread/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/system/select/Makefile b/examples/system/select/Makefile
deleted file mode 100644
index e70931d40b..0000000000
--- a/examples/system/select/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := select
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/system/select/main/component.mk b/examples/system/select/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/system/select/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/system/startup_time/Makefile b/examples/system/startup_time/Makefile
deleted file mode 100644
index 1f1264300b..0000000000
--- a/examples/system/startup_time/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := startup_time
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/system/startup_time/main/component.mk b/examples/system/startup_time/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/system/startup_time/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/system/sysview_tracing/Makefile b/examples/system/sysview_tracing/Makefile
deleted file mode 100644
index 2eef0bf4e2..0000000000
--- a/examples/system/sysview_tracing/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := sysview_tracing
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/system/sysview_tracing/main/component.mk b/examples/system/sysview_tracing/main/component.mk
deleted file mode 100644
index 44bd2b5273..0000000000
--- a/examples/system/sysview_tracing/main/component.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-#
-# Main Makefile. This is basically the same as a component makefile.
-#
diff --git a/examples/system/sysview_tracing_heap_log/Makefile b/examples/system/sysview_tracing_heap_log/Makefile
deleted file mode 100644
index 88cc618df4..0000000000
--- a/examples/system/sysview_tracing_heap_log/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := sysview_tracing_heap_log
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/system/sysview_tracing_heap_log/main/component.mk b/examples/system/sysview_tracing_heap_log/main/component.mk
deleted file mode 100644
index 44bd2b5273..0000000000
--- a/examples/system/sysview_tracing_heap_log/main/component.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-#
-# Main Makefile. This is basically the same as a component makefile.
-#
diff --git a/examples/system/task_watchdog/Makefile b/examples/system/task_watchdog/Makefile
deleted file mode 100644
index cfae7f6b72..0000000000
--- a/examples/system/task_watchdog/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := task_watchdog
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/system/task_watchdog/main/component.mk b/examples/system/task_watchdog/main/component.mk
deleted file mode 100644
index 44bd2b5273..0000000000
--- a/examples/system/task_watchdog/main/component.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-#
-# Main Makefile. This is basically the same as a component makefile.
-#
diff --git a/examples/system/ulp_fsm/ulp/Makefile b/examples/system/ulp_fsm/ulp/Makefile
deleted file mode 100644
index b9b17e5ef4..0000000000
--- a/examples/system/ulp_fsm/ulp/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := ulp_example
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/system/ulp_fsm/ulp/main/component.mk b/examples/system/ulp_fsm/ulp/main/component.mk
deleted file mode 100644
index 22e0a859a4..0000000000
--- a/examples/system/ulp_fsm/ulp/main/component.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# ULP support additions to component makefile.
-#
-# 1. ULP_APP_NAME must be unique (if multiple components use ULP)
-#    Default value, override if necessary:
-ULP_APP_NAME ?= ulp_$(COMPONENT_NAME)
-#
-# 2. Specify all assembly source files here.
-#    Files should be placed into a separate directory (in this case, ulp/),
-#    which should not be added to COMPONENT_SRCDIRS.
-ULP_S_SOURCES = $(addprefix $(COMPONENT_PATH)/ulp/, \
-	pulse_cnt.S \
-	wake_up.S \
-	)
-#
-# 3. List all the component object files which include automatically
-#    generated ULP export file, $(ULP_APP_NAME).h:
-ULP_EXP_DEP_OBJECTS := ulp_example_main.o
-#
-# 4. Include build rules for ULP program
-include $(IDF_PATH)/components/ulp/component_ulp_common.mk
-#
-# End of ULP support additions to component makefile.
-#
diff --git a/examples/system/ulp_fsm/ulp_adc/Makefile b/examples/system/ulp_fsm/ulp_adc/Makefile
deleted file mode 100644
index ab4dcdc6f4..0000000000
--- a/examples/system/ulp_fsm/ulp_adc/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := ulp_adc_example
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/system/ulp_fsm/ulp_adc/main/component.mk b/examples/system/ulp_fsm/ulp_adc/main/component.mk
deleted file mode 100644
index e9423d3ef5..0000000000
--- a/examples/system/ulp_fsm/ulp_adc/main/component.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# ULP support additions to component makefile.
-#
-# 1. ULP_APP_NAME must be unique (if multiple components use ULP)
-#    Default value, override if necessary:
-ULP_APP_NAME ?= ulp_$(COMPONENT_NAME)
-#
-# 2. Specify all assembly source files here.
-#    Files should be placed into a separate directory (in this case, ulp/),
-#    which should not be added to COMPONENT_SRCDIRS.
-ULP_S_SOURCES = $(addprefix $(COMPONENT_PATH)/ulp/, \
-	adc.S \
-	)
-#
-# 3. List all the component object files which include automatically
-#    generated ULP export file, $(ULP_APP_NAME).h:
-ULP_EXP_DEP_OBJECTS := ulp_adc_example_main.o
-#
-# 4. Include build rules for ULP program
-include $(IDF_PATH)/components/ulp/component_ulp_common.mk
-#
-# End of ULP support additions to component makefile.
-#
diff --git a/examples/system/unit_test/Makefile b/examples/system/unit_test/Makefile
deleted file mode 100644
index e5bb9ff3c7..0000000000
--- a/examples/system/unit_test/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile for the example project.
-# See 'test' subdirectory for the test subproject.
-#
-
-PROJECT_NAME := unit_test
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/system/unit_test/components/testable/component.mk b/examples/system/unit_test/components/testable/component.mk
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/examples/system/unit_test/components/testable/test/component.mk b/examples/system/unit_test/components/testable/test/component.mk
deleted file mode 100644
index e8e167ccf2..0000000000
--- a/examples/system/unit_test/components/testable/test/component.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-# This is the minimal test component makefile.
-#
-# The following line is needed to force the linker to include all the object
-# files into the application, even if the functions in these object files
-# are not referenced from outside (which is usually the case for unit tests).
-#
-COMPONENT_ADD_LDFLAGS = -Wl,--whole-archive -l$(COMPONENT_NAME) -Wl,--no-whole-archive
diff --git a/examples/system/unit_test/main/component.mk b/examples/system/unit_test/main/component.mk
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/examples/system/unit_test/test/Makefile b/examples/system/unit_test/test/Makefile
deleted file mode 100644
index 07ae8aa28f..0000000000
--- a/examples/system/unit_test/test/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# This is a project Makefile for the test subproject.
-#
-
-PROJECT_NAME := unit_test_test
-
-# Include the components directory of the main application:
-#
-EXTRA_COMPONENT_DIRS := $(realpath ../components)
-
-# Set the components to include the tests for.
-# This can be overriden from the command line
-# (e.g. 'make TEST_COMPONENTS=xxxx flash monitor')
-#
-TEST_COMPONENTS ?= testable
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/system/unit_test/test/main/component.mk b/examples/system/unit_test/test/main/component.mk
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/examples/wifi/espnow/Makefile b/examples/wifi/espnow/Makefile
deleted file mode 100644
index 6760c0d8c9..0000000000
--- a/examples/wifi/espnow/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := espnow_example
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/wifi/espnow/main/component.mk b/examples/wifi/espnow/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/wifi/espnow/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/wifi/fast_scan/Makefile b/examples/wifi/fast_scan/Makefile
deleted file mode 100644
index a2218e93ff..0000000000
--- a/examples/wifi/fast_scan/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := fast_scan
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/wifi/fast_scan/main/component.mk b/examples/wifi/fast_scan/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/wifi/fast_scan/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/wifi/getting_started/softAP/Makefile b/examples/wifi/getting_started/softAP/Makefile
deleted file mode 100644
index f8ddccd594..0000000000
--- a/examples/wifi/getting_started/softAP/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := wifi_softAP
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/wifi/getting_started/softAP/main/component.mk b/examples/wifi/getting_started/softAP/main/component.mk
deleted file mode 100644
index 0adf45649a..0000000000
--- a/examples/wifi/getting_started/softAP/main/component.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Main component makefile.
-#
-# This Makefile can be left empty. By default, it will take the sources in the
-# src/ directory, compile them and link them into lib(subdirectory_name).a
-# in the build directory. This behaviour is entirely configurable,
-# please read the ESP-IDF documents if you need to do this.
-#
diff --git a/examples/wifi/getting_started/station/Makefile b/examples/wifi/getting_started/station/Makefile
deleted file mode 100644
index 84ddf45aef..0000000000
--- a/examples/wifi/getting_started/station/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := wifi_station
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/wifi/getting_started/station/main/component.mk b/examples/wifi/getting_started/station/main/component.mk
deleted file mode 100644
index 0adf45649a..0000000000
--- a/examples/wifi/getting_started/station/main/component.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Main component makefile.
-#
-# This Makefile can be left empty. By default, it will take the sources in the
-# src/ directory, compile them and link them into lib(subdirectory_name).a
-# in the build directory. This behaviour is entirely configurable,
-# please read the ESP-IDF documents if you need to do this.
-#
diff --git a/examples/wifi/iperf/Makefile b/examples/wifi/iperf/Makefile
deleted file mode 100644
index b456c0142f..0000000000
--- a/examples/wifi/iperf/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := iperf
-
-EXTRA_COMPONENT_DIRS := $(IDF_PATH)/examples/system/console/advanced/components
-EXTRA_COMPONENT_DIRS += $(IDF_PATH)/examples/common_components/iperf
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/wifi/iperf/main/component.mk b/examples/wifi/iperf/main/component.mk
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/examples/wifi/power_save/Makefile b/examples/wifi/power_save/Makefile
deleted file mode 100644
index 62a7d0f5cf..0000000000
--- a/examples/wifi/power_save/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := power_save
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/wifi/power_save/main/component.mk b/examples/wifi/power_save/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/wifi/power_save/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/wifi/roaming/Makefile b/examples/wifi/roaming/Makefile
deleted file mode 100644
index db88366ce7..0000000000
--- a/examples/wifi/roaming/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := roaminng
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/wifi/roaming/main/component.mk b/examples/wifi/roaming/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/wifi/roaming/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/wifi/scan/Makefile b/examples/wifi/scan/Makefile
deleted file mode 100644
index 4a9617351c..0000000000
--- a/examples/wifi/scan/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := scan
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/wifi/scan/main/component.mk b/examples/wifi/scan/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/wifi/scan/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/wifi/smart_config/Makefile b/examples/wifi/smart_config/Makefile
deleted file mode 100644
index 48ea74c0de..0000000000
--- a/examples/wifi/smart_config/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := smart_config
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/wifi/smart_config/main/component.mk b/examples/wifi/smart_config/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/wifi/smart_config/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/examples/wifi/wifi_easy_connect/dpp-enrollee/Makefile b/examples/wifi/wifi_easy_connect/dpp-enrollee/Makefile
deleted file mode 100644
index 681e7b2b48..0000000000
--- a/examples/wifi/wifi_easy_connect/dpp-enrollee/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := dpp-enrollee
-
-EXTRA_COMPONENT_DIRS = $(IDF_PATH)/examples/common_components/qrcode
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/wifi/wifi_easy_connect/dpp-enrollee/main/component.mk b/examples/wifi/wifi_easy_connect/dpp-enrollee/main/component.mk
deleted file mode 100644
index 0adf45649a..0000000000
--- a/examples/wifi/wifi_easy_connect/dpp-enrollee/main/component.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Main component makefile.
-#
-# This Makefile can be left empty. By default, it will take the sources in the
-# src/ directory, compile them and link them into lib(subdirectory_name).a
-# in the build directory. This behaviour is entirely configurable,
-# please read the ESP-IDF documents if you need to do this.
-#
diff --git a/examples/wifi/wifi_enterprise/Makefile b/examples/wifi/wifi_enterprise/Makefile
deleted file mode 100644
index 4f0f9d04b1..0000000000
--- a/examples/wifi/wifi_enterprise/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := wifi_enterprise
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/wifi/wifi_enterprise/main/component.mk b/examples/wifi/wifi_enterprise/main/component.mk
deleted file mode 100644
index 19aafa5d04..0000000000
--- a/examples/wifi/wifi_enterprise/main/component.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
-
-# embed files from the "certs" directory as binary data symbols
-# in the app
-COMPONENT_EMBED_TXTFILES := ca.pem
-COMPONENT_EMBED_TXTFILES += client.crt
-COMPONENT_EMBED_TXTFILES += client.key
diff --git a/examples/wifi/wps/Makefile b/examples/wifi/wps/Makefile
deleted file mode 100644
index ca3c026091..0000000000
--- a/examples/wifi/wps/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := wps_example
-
-include $(IDF_PATH)/make/project.mk
diff --git a/examples/wifi/wps/main/component.mk b/examples/wifi/wps/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/examples/wifi/wps/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/tools/test_apps/build_system/ldgen_test/main/component.mk b/tools/test_apps/build_system/ldgen_test/main/component.mk
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tools/test_apps/build_system/rsource_test/Makefile b/tools/test_apps/build_system/rsource_test/Makefile
deleted file mode 100644
index ade5499de0..0000000000
--- a/tools/test_apps/build_system/rsource_test/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := rsource_test
-
-include $(IDF_PATH)/make/project.mk
diff --git a/tools/test_apps/build_system/rsource_test/main/component.mk b/tools/test_apps/build_system/rsource_test/main/component.mk
deleted file mode 100644
index 08105c4f2c..0000000000
--- a/tools/test_apps/build_system/rsource_test/main/component.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-ifndef CONFIG_RSOURCE_EXTRA_CONFIG
-    $(error RSOURCE config not included)
-endif
diff --git a/tools/test_apps/protocols/mqtt/publish_connect_test/Makefile b/tools/test_apps/protocols/mqtt/publish_connect_test/Makefile
deleted file mode 100644
index 49c193dd36..0000000000
--- a/tools/test_apps/protocols/mqtt/publish_connect_test/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-PROJECT_NAME := mqtt_publish_connect_test
-
-EXTRA_COMPONENT_DIRS = $(IDF_PATH)/examples/common_components/protocol_examples_common
-
-include $(IDF_PATH)/make/project.mk
diff --git a/tools/test_apps/protocols/mqtt/publish_connect_test/main/component.mk b/tools/test_apps/protocols/mqtt/publish_connect_test/main/component.mk
deleted file mode 100644
index ba6d98626f..0000000000
--- a/tools/test_apps/protocols/mqtt/publish_connect_test/main/component.mk
+++ /dev/null
@@ -1 +0,0 @@
-COMPONENT_EMBED_TXTFILES := mqtt_eclipse_org.pem ../ca.crt ../ca.der ../client_pwd.key ../client_pwd.crt ../client_no_pwd.key ../client_inv.crt
diff --git a/tools/test_apps/protocols/openssl/main/component.mk b/tools/test_apps/protocols/openssl/main/component.mk
deleted file mode 100644
index 44bd2b5273..0000000000
--- a/tools/test_apps/protocols/openssl/main/component.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-#
-# Main Makefile. This is basically the same as a component makefile.
-#
diff --git a/tools/test_apps/security/secure_boot/Makefile b/tools/test_apps/security/secure_boot/Makefile
deleted file mode 100644
index 58e31ed0dd..0000000000
--- a/tools/test_apps/security/secure_boot/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := secure_boot
-
-include $(IDF_PATH)/make/project.mk
diff --git a/tools/test_apps/security/secure_boot/main/component.mk b/tools/test_apps/security/secure_boot/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/tools/test_apps/security/secure_boot/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/tools/test_apps/system/longjmp_test/Makefile b/tools/test_apps/system/longjmp_test/Makefile
deleted file mode 100644
index e43bc1f177..0000000000
--- a/tools/test_apps/system/longjmp_test/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_NAME := longjmp_test
-
-include $(IDF_PATH)/make/project.mk
diff --git a/tools/test_apps/system/longjmp_test/main/component.mk b/tools/test_apps/system/longjmp_test/main/component.mk
deleted file mode 100644
index a98f634eae..0000000000
--- a/tools/test_apps/system/longjmp_test/main/component.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# "main" pseudo-component makefile.
-#
-# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)