Skip to content

Commit 1e1caa4

Browse files
committed
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
2 parents 48f023e + 56ab9dd commit 1e1caa4

File tree

6 files changed

+0
-14
lines changed

6 files changed

+0
-14
lines changed

components/aws_iot/component.mk

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@ COMPONENT_ADD_INCLUDEDIRS := include aws-iot-device-sdk-embedded-C/include
88

99
COMPONENT_SRCDIRS := aws-iot-device-sdk-embedded-C/src port
1010

11-
# Check the submodule is initialised
12-
COMPONENT_SUBMODULES := aws-iot-device-sdk-embedded-C
13-
14-
1511
else
1612
# Disable AWS IoT support
1713
COMPONENT_ADD_INCLUDEDIRS :=

components/coap/component.mk

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ COMPONENT_OBJS = libcoap/src/address.o libcoap/src/async.o libcoap/src/block.o l
88

99
COMPONENT_SRCDIRS := libcoap/src libcoap port
1010

11-
COMPONENT_SUBMODULES += libcoap
12-
1311
libcoap/src/debug.o: CFLAGS += -Wno-write-strings
1412
libcoap/src/pdu.o: CFLAGS += -Wno-write-strings
1513
# Temporary suppress "fallthrough" warnings until they are fixed in libcoap repo

components/esptool_py/Makefile.projbuild

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,10 +82,6 @@ app-flash: $(APP_BIN) $(ESPTOOLPY_SRC) $(call prereq_if_explicit,erase_flash)
8282
@echo "Flashing app to serial port $(ESPPORT), offset $(APP_OFFSET)..."
8383
$(ESPTOOLPY_WRITE_FLASH) $(APP_OFFSET) $(APP_BIN)
8484

85-
# Submodules normally added in component.mk, but can be added
86-
# at the project level as long as qualified path
87-
COMPONENT_SUBMODULES += $(COMPONENT_PATH)/esptool
88-
8985
erase_flash:
9086
@echo "Erasing entire flash..."
9187
$(ESPTOOLPY_SERIAL) erase_flash

components/libsodium/component.mk

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
COMPONENT_SUBMODULES += libsodium
21

32
# Common root directory for all source directories
43
LSRC := libsodium/src/libsodium

components/mqtt/component.mk

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ COMPONENT_SRCDIRS += ibm-mqtt/MQTTClient-C/src \
1111
CFLAGS += -DMQTT_TASK
1212
else
1313
ifdef CONFIG_MQTT_USING_ESP
14-
COMPONENT_SUBMODULES += esp-mqtt
1514
COMPONENT_ADD_INCLUDEDIRS := esp-mqtt/include
1615
COMPONENT_SRCDIRS := esp-mqtt esp-mqtt/lib
1716
COMPONENT_PRIV_INCLUDEDIRS := esp-mqtt/lib/include

components/protobuf-c/component.mk

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,3 @@
44
COMPONENT_ADD_INCLUDEDIRS := protobuf-c
55

66
COMPONENT_SRCDIRS := protobuf-c/protobuf-c
7-
8-
COMPONENT_SUBMODULES += protobuf-c

0 commit comments

Comments
 (0)