Merge branch 'feature/remove_submodule_declare' into 'master'

make: remove submodule declare for using real submodule later

See merge request sdk/ESP8266_RTOS_SDK!1102
This commit is contained in:
Dong Heng
2019-09-18 15:56:54 +08:00
6 changed files with 0 additions and 14 deletions

View File

@ -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 :=

View File

@ -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

View File

@ -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

View File

@ -1,4 +1,3 @@
COMPONENT_SUBMODULES += libsodium
# Common root directory for all source directories
LSRC := libsodium/src/libsodium

View File

@ -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

View File

@ -4,5 +4,3 @@
COMPONENT_ADD_INCLUDEDIRS := protobuf-c
COMPONENT_SRCDIRS := protobuf-c/protobuf-c
COMPONENT_SUBMODULES += protobuf-c