From 25e972e8a41909f88ce66a7b8e9ac3f744425156 Mon Sep 17 00:00:00 2001
From: Nick Brassel <nick@tzarc.org>
Date: Tue, 5 Jan 2021 07:36:02 +1100
Subject: Fix up build dependencies. (#11435)

---
 build_keyboard.mk | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'build_keyboard.mk')

diff --git a/build_keyboard.mk b/build_keyboard.mk
index d9bb2b92e2..9685d1f632 100644
--- a/build_keyboard.mk
+++ b/build_keyboard.mk
@@ -319,6 +319,10 @@ $(KEYBOARD_OUTPUT)/src/info_config.h: $(INFO_JSON_FILES)
 $(KEYBOARD_OUTPUT)/src/layouts.h: $(INFO_JSON_FILES)
 	bin/qmk generate-layouts --quiet --keyboard $(KEYBOARD) --output $(KEYBOARD_OUTPUT)/src/layouts.h
 
+generated-files: $(KEYBOARD_OUTPUT)/src/info_config.h $(KEYBOARD_OUTPUT)/src/layouts.h
+
+.INTERMEDIATE : generated-files
+
 # project specific files
 SRC += $(KEYBOARD_SRC) \
     $(KEYMAP_C) \
@@ -393,10 +397,16 @@ all:
 	echo "skipped" >&2
 endif
 
-build: $(KEYBOARD_OUTPUT)/src/info_config.h $(KEYBOARD_OUTPUT)/src/layouts.h elf cpfirmware
+build: elf cpfirmware
 check-size: build
 check-md5: build
 objs-size: build
 
 include show_options.mk
 include $(TMK_PATH)/rules.mk
+
+# Ensure we have generated files available for each of the objects
+define GEN_FILES
+$1: generated-files
+endef
+$(foreach O,$(OBJ),$(eval $(call GEN_FILES,$(patsubst %.a,%.o,$(O)))))
-- 
cgit v1.2.3