From 56ab9ddc9e247a7129eb473710a5b86f8317fb2f Mon Sep 17 00:00:00 2001
From: dongheng <Dong Heng>
Date: Wed, 18 Sep 2019 13:58:08 +0800
Subject: [PATCH] feat(make): remove submodule declare for using real submodule
 later

---
 components/aws_iot/component.mk          | 4 ----
 components/coap/component.mk             | 2 --
 components/esptool_py/Makefile.projbuild | 4 ----
 components/libsodium/component.mk        | 1 -
 components/mqtt/component.mk             | 1 -
 components/protobuf-c/component.mk       | 2 --
 6 files changed, 14 deletions(-)

diff --git a/components/aws_iot/component.mk b/components/aws_iot/component.mk
index cd1b15ee..f837a60a 100644
--- a/components/aws_iot/component.mk
+++ b/components/aws_iot/component.mk
@@ -8,10 +8,6 @@ COMPONENT_ADD_INCLUDEDIRS := include aws-iot-device-sdk-embedded-C/include
 
 COMPONENT_SRCDIRS := aws-iot-device-sdk-embedded-C/src port
 
-# Check the submodule is initialised
-COMPONENT_SUBMODULES := aws-iot-device-sdk-embedded-C
-
-
 else
 # Disable AWS IoT support
 COMPONENT_ADD_INCLUDEDIRS :=
diff --git a/components/coap/component.mk b/components/coap/component.mk
index 4b3d56f5..5bef303d 100644
--- a/components/coap/component.mk
+++ b/components/coap/component.mk
@@ -8,8 +8,6 @@ COMPONENT_OBJS = libcoap/src/address.o libcoap/src/async.o libcoap/src/block.o l
 
 COMPONENT_SRCDIRS := libcoap/src libcoap port
 
-COMPONENT_SUBMODULES += libcoap
-
 libcoap/src/debug.o: CFLAGS += -Wno-write-strings
 libcoap/src/pdu.o: CFLAGS += -Wno-write-strings
 # Temporary suppress "fallthrough" warnings until they are fixed in libcoap repo
diff --git a/components/esptool_py/Makefile.projbuild b/components/esptool_py/Makefile.projbuild
index cae228aa..c45762fb 100644
--- a/components/esptool_py/Makefile.projbuild
+++ b/components/esptool_py/Makefile.projbuild
@@ -82,10 +82,6 @@ app-flash: $(APP_BIN) $(ESPTOOLPY_SRC) $(call prereq_if_explicit,erase_flash)
 	@echo "Flashing app to serial port $(ESPPORT), offset $(APP_OFFSET)..."
 	$(ESPTOOLPY_WRITE_FLASH) $(APP_OFFSET) $(APP_BIN)
 
-# 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:
 	@echo "Erasing entire flash..."
 	$(ESPTOOLPY_SERIAL) erase_flash
diff --git a/components/libsodium/component.mk b/components/libsodium/component.mk
index bee2d5dd..2f6bd68d 100644
--- a/components/libsodium/component.mk
+++ b/components/libsodium/component.mk
@@ -1,4 +1,3 @@
-COMPONENT_SUBMODULES += libsodium
 
 # Common root directory for all source directories
 LSRC := libsodium/src/libsodium
diff --git a/components/mqtt/component.mk b/components/mqtt/component.mk
index df82dbfe..299be0ca 100644
--- a/components/mqtt/component.mk
+++ b/components/mqtt/component.mk
@@ -11,7 +11,6 @@ COMPONENT_SRCDIRS += ibm-mqtt/MQTTClient-C/src \
 CFLAGS += -DMQTT_TASK
 else
 ifdef CONFIG_MQTT_USING_ESP
-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/protobuf-c/component.mk b/components/protobuf-c/component.mk
index a8c4900a..afb82ca1 100644
--- a/components/protobuf-c/component.mk
+++ b/components/protobuf-c/component.mk
@@ -4,5 +4,3 @@
 COMPONENT_ADD_INCLUDEDIRS := protobuf-c
 
 COMPONENT_SRCDIRS := protobuf-c/protobuf-c
-
-COMPONENT_SUBMODULES += protobuf-c