include after main rules so that deps exist

2023-02-22 15:58:15 -08:00 · 2023-02-22 15:58:15 -08:00 · 07b2f1b783
parent 4c0707e751
commit 07b2f1b783
6 changed files with 9 additions and 4 deletions
--- a/firmware/Makefile
+++ b/firmware/Makefile
@ -383,7 +383,8 @@ openblt_clean:
 	make -f $(PROJECT_DIR)/hw_layer/openblt/openblt.mk clean BOARD_DIR=$(BOARD_DIR) PROJECT_BOARD=$(PROJECT_BOARD) PROJECT_CPU=$(PROJECT_CPU)

 # Enable precompiled header
-include rusefi_pch.mk
+include $(PROJECT_DIR)/rusefi_pch.mk
+include $(PROJECT_DIR)/gitversion.mk

 POST_MAKE_ALL_RULE_HOOK: $(BUILDDIR)/$(PROJECT).elf
 	@java -jar ../java_tools/gcc_map_reader.jar $(BUILDDIR)/$(PROJECT).map | grep Total || echo Unable to run gcc_map_reader
--- a/firmware/bootloader/src/Makefile
+++ b/firmware/bootloader/src/Makefile
@ -335,3 +335,4 @@ ULIBS = -lm --specs=nano.specs

 include $(RULESFILE)
 include $(PROJECT_DIR)/rusefi_pch.mk
+include $(PROJECT_DIR)/gitversion.mk
--- a/firmware/gitversion.mk
+++ b/firmware/gitversion.mk
@ -9,3 +9,7 @@ gitversion.h.gen : .FORCE

 gitversion.h : gitversion.h.gen
 	rsync --checksum $< $@
+
+# All objects could depend on git version
+$(TCPPOBJS) : gitversion.h
+$(ACPPOBJS) : gitversion.h
--- a/firmware/rusefi.mk
+++ b/firmware/rusefi.mk
@ -80,6 +80,3 @@ endif
 ifeq ($(GENERATED_ENUMS_DIR),)
 GENERATED_ENUMS_DIR = $(PROJECT_DIR)/controllers/algo
 endif
-
-# Generate git version header
-include gitversion.mk
--- a/simulator/Makefile
+++ b/simulator/Makefile
@ -284,3 +284,4 @@ include $(RULESPATH)/rules.mk

 # Enable precompiled header
 include $(PROJECT_DIR)/rusefi_pch.mk
+include $(PROJECT_DIR)/gitversion.mk
--- a/unit_tests/unit_test_rules.mk
+++ b/unit_tests/unit_test_rules.mk
@ -238,3 +238,4 @@ endif

 include $(UNIT_TESTS_DIR)/rules.mk
 include $(PROJECT_DIR)/rusefi_pch.mk
+include $(PROJECT_DIR)/gitversion.mk