Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions module/base/makefile
Original file line number Diff line number Diff line change
Expand Up @@ -269,8 +269,6 @@ DEFINES += $(call convert_defines, $(BOARD) $(SOC) $(MCU) $(CPU) $(ARCH) $(RTOS)
TARGET_NAME ?= $(BIN_DIR)/$(PROJECT_NAME)
TARGET_ELF = $(TARGET_NAME).$(LD_EXTENSION)

-include $(patsubst %.o,%.d,$(PROJECT_OBJ))

##################################################################################################
#
PROJECT_OBJ += $(call objects_list,$(PROJECT_SRC),c)
Expand All @@ -279,6 +277,9 @@ $(foreach path,$(PROJECT_SRC),$(eval $(call c_compiler_rule,$(path),$($1_INC),$(
PROJECT_OBJ += $(call objects_list,$(PROJECT_SRC),s)
$(foreach path,$(PROJECT_SRC),$(eval $(call assembler_rule,$(path),$($1_INC),$(OBJ_DIR)/$(call short_path,$(path)))))

# Load project compile dependencies if present (must be placed after PROJECT_OBJ is completely defined)
-include $(patsubst %.o,%.d,$(PROJECT_OBJ))

##################################################################################################
$(TARGET_ELF): $(PROJECT_LIB) $(PROJECT_OBJ)
$(call show_action,Linking $(call short_path,$(TARGET_ELF)))
Expand Down