From 7766caa52eff5ac83fb5987de269a21e0fabd8ee Mon Sep 17 00:00:00 2001 From: honorless <86894501+lesshonor@users.noreply.github.com> Date: Sat, 9 Sep 2023 07:28:58 -0400 Subject: [PATCH] refactor: unify location of generated build files Moving Vial's generated files to the same place all the other generated files go means not having to tack on EXTRAINCDIRS. --- builddefs/common_features.mk | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/builddefs/common_features.mk b/builddefs/common_features.mk index 85e309484e6..e94a70c3c12 100644 --- a/builddefs/common_features.mk +++ b/builddefs/common_features.mk @@ -635,13 +635,12 @@ ifeq ($(strip $(VIAL_ENABLE)), yes) COMBO_ENABLE ?= yes KEY_OVERRIDE_ENABLE ?= yes SRC += $(QUANTUM_DIR)/vial.c - EXTRAINCDIRS += $(INTERMEDIATE_OUTPUT) OPT_DEFS += -DVIAL_ENABLE -DNO_DEBUG -DSERIAL_NUMBER=\"vial:f64c2b3c\" -$(QUANTUM_DIR)/vial.c: $(INTERMEDIATE_OUTPUT)/vial_generated_keyboard_definition.h +$(QUANTUM_DIR)/vial.c: $(INTERMEDIATE_OUTPUT)/src/vial_generated_keyboard_definition.h -$(INTERMEDIATE_OUTPUT)/vial_generated_keyboard_definition.h: $(KEYMAP_PATH)/vial.json - python3 util/vial_generate_definition.py $(KEYMAP_PATH)/vial.json $(INTERMEDIATE_OUTPUT)/vial_generated_keyboard_definition.h +$(INTERMEDIATE_OUTPUT)/src/vial_generated_keyboard_definition.h: $(KEYMAP_PATH)/vial.json + python3 util/vial_generate_definition.py $(KEYMAP_PATH)/vial.json $(INTERMEDIATE_OUTPUT)/src/vial_generated_keyboard_definition.h endif ifeq ($(strip $(VIAL_INSECURE)), yes)