From 07b2f1b783c4fed6cc84aea14021b68a5901d80e Mon Sep 17 00:00:00 2001
From: Matthew Kennedy <matthewkennedy@outlook.com>
Date: Wed, 22 Feb 2023 15:58:15 -0800
Subject: [PATCH] include after main rules so that deps exist

---
 firmware/Makefile                | 3 ++-
 firmware/bootloader/src/Makefile | 1 +
 firmware/gitversion.mk           | 4 ++++
 firmware/rusefi.mk               | 3 ---
 simulator/Makefile               | 1 +
 unit_tests/unit_test_rules.mk    | 1 +
 6 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/firmware/Makefile b/firmware/Makefile
index 217b7b49b4..7bb940effb 100644
--- 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
diff --git a/firmware/bootloader/src/Makefile b/firmware/bootloader/src/Makefile
index f4f72e1420..1fae6af345 100644
--- 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
diff --git a/firmware/gitversion.mk b/firmware/gitversion.mk
index cede31be9f..64aad766a8 100644
--- 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
diff --git a/firmware/rusefi.mk b/firmware/rusefi.mk
index 2914164e91..48cc8ca000 100644
--- 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
diff --git a/simulator/Makefile b/simulator/Makefile
index e61729913c..30dd557c4c 100644
--- 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
diff --git a/unit_tests/unit_test_rules.mk b/unit_tests/unit_test_rules.mk
index cc93f51730..90b02ed2d6 100644
--- 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