diff options
| author | Joel Challis <git@zvecr.com> | 2021-08-20 10:11:49 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-20 19:11:49 +1000 |
| commit | b229b0fba72d79f1c723f2415531e61537b56fc3 (patch) | |
| tree | 99c0cf56f53aee30aa3d0b1ed00820dcf622f78f /build_keyboard.mk | |
| parent | 0741aae1d9e53206d5930fcb962948f13f48e661 (diff) | |
Fix issues with recent keymap.json changes (#14089)
* Fix issues with recent keymap.json changes
* Allow empty author string
Diffstat (limited to 'build_keyboard.mk')
| -rw-r--r-- | build_keyboard.mk | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/build_keyboard.mk b/build_keyboard.mk index daef76080a..37fa6852f8 100644 --- a/build_keyboard.mk +++ b/build_keyboard.mk @@ -148,24 +148,24 @@ endif # Have we found a keymap.json? ifneq ("$(wildcard $(KEYMAP_JSON))", "") - KEYMAP_C := $(KEYMAP_OUTPUT)/keymap.c - KEYMAP_H := $(KEYMAP_OUTPUT)/config.h + KEYMAP_C := $(KEYMAP_OUTPUT)/src/keymap.c + KEYMAP_H := $(KEYMAP_OUTPUT)/src/config.h # Load the keymap-level rules.mk if exists -include $(KEYMAP_PATH)/rules.mk # Load any rules.mk content from keymap.json - INFO_RULES_MK = $(shell (QMK_BIN) generate-rules-mk --quiet --escape --keyboard $(KEYBOARD) --keymap $(KEYMAP) --output $(KEYMAP_OUTPUT)/rules.mk) + INFO_RULES_MK = $(shell $(QMK_BIN) generate-rules-mk --quiet --escape --keyboard $(KEYBOARD) --keymap $(KEYMAP) --output $(KEYMAP_OUTPUT)/src/rules.mk) include $(INFO_RULES_MK) -# Add rules to enerate the keymap files - indentation here is important -$(KEYMAP_OUTPUT)/keymap.c: $(KEYMAP_JSON) - (QMK_BIN) json2c --quiet --output $(KEYMAP_C) $(KEYMAP_JSON) +# Add rules to generate the keymap files - indentation here is important +$(KEYMAP_OUTPUT)/src/keymap.c: $(KEYMAP_JSON) + $(QMK_BIN) json2c --quiet --output $(KEYMAP_C) $(KEYMAP_JSON) -$(KEYMAP_OUTPUT)/config.h: $(KEYMAP_JSON) - (QMK_BIN) generate-config-h --quiet --keyboard $(KEYBOARD) --keymap $(KEYMAP) --output $(KEYMAP_OUTPUT)/config.h +$(KEYMAP_OUTPUT)/src/config.h: $(KEYMAP_JSON) + $(QMK_BIN) generate-config-h --quiet --keyboard $(KEYBOARD) --keymap $(KEYMAP) --output $(KEYMAP_H) -generated-files: $(KEYMAP_OUTPUT)/config.h $(KEYMAP_OUTPUT)/keymap.c +generated-files: $(KEYMAP_OUTPUT)/src/config.h $(KEYMAP_OUTPUT)/src/keymap.c endif |