|
|
@@ -181,6 +181,18 @@ endif
|
|
|
# Include all dependency files already generated
|
|
|
-include $(COMPONENT_OBJS:.o=.d)
|
|
|
|
|
|
+# This is a fix for situation where the project or IDF dir moves, and instead
|
|
|
+# of rebuilding the target the build fails until make clean is run
|
|
|
+#
|
|
|
+# It adds an empty dependency rule for the (possibly non-existent) source file itself,
|
|
|
+# which prevents it not being found from failing the build
|
|
|
+#
|
|
|
+# $1 == Source File, $2 == .o file used for .d file name
|
|
|
+define AppendSourceToDependencies
|
|
|
+echo "$1:" >> $$(patsubst %.o,%.d,$2)
|
|
|
+endef
|
|
|
+
|
|
|
+
|
|
|
# This pattern is generated for each COMPONENT_SRCDIR to compile the files in it.
|
|
|
define GenerateCompileTargets
|
|
|
# $(1) - directory containing source files, relative to $(COMPONENT_PATH) - one of $(COMPONENT_SRCDIRS)
|
|
|
@@ -188,14 +200,17 @@ define GenerateCompileTargets
|
|
|
$(1)/%.o: $$(COMPONENT_PATH)/$(1)/%.c $(COMMON_MAKEFILES) $(COMPONENT_MAKEFILE) | $(COMPONENT_SRCDIRS)
|
|
|
$$(summary) CC $$@
|
|
|
$$(CC) $$(CFLAGS) $$(CPPFLAGS) $$(addprefix -I ,$$(COMPONENT_INCLUDES)) $$(addprefix -I ,$$(COMPONENT_EXTRA_INCLUDES)) -I$(1) -c $$< -o $$@
|
|
|
+ $(call AppendSourceToDependencies,$$<,$$@)
|
|
|
|
|
|
$(1)/%.o: $$(COMPONENT_PATH)/$(1)/%.cpp $(COMMON_MAKEFILES) $(COMPONENT_MAKEFILE) | $(COMPONENT_SRCDIRS)
|
|
|
$$(summary) CXX $$@
|
|
|
$$(CXX) $$(CXXFLAGS) $$(CPPFLAGS) $$(addprefix -I,$$(COMPONENT_INCLUDES)) $$(addprefix -I,$$(COMPONENT_EXTRA_INCLUDES)) -I$(1) -c $$< -o $$@
|
|
|
+ $(call AppendSourceToDependencies,$$<,$$@)
|
|
|
|
|
|
$(1)/%.o: $$(COMPONENT_PATH)/$(1)/%.S $(COMMON_MAKEFILES) $(COMPONENT_MAKEFILE) | $(COMPONENT_SRCDIRS)
|
|
|
$$(summary) AS $$@
|
|
|
$$(CC) $$(CPPFLAGS) $$(DEBUG_FLAGS) $$(addprefix -I ,$$(COMPONENT_INCLUDES)) $$(addprefix -I ,$$(COMPONENT_EXTRA_INCLUDES)) -I$(1) -c $$< -o $$@
|
|
|
+ $(call AppendSourceToDependencies,$$<,$$@)
|
|
|
|
|
|
# CWD is build dir, create the build subdirectory if it doesn't exist
|
|
|
#
|