diff options
| author | Joel Challis <git@zvecr.com> | 2023-01-03 03:15:29 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-03 14:15:29 +1100 |
| commit | c345278101b3882a2f33b078021ab31a6129120a (patch) | |
| tree | 3b5bc671cf95fc56cc9e5eea2b62d223e44f321e /Makefile | |
| parent | 44800f119d330bb0f02f3d13c36cafe57adc20ee (diff) | |
Replace list_keyboards.sh with CLI calls (#19485)
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Makefile b/Makefile index 8f7ad39b83..e10816aa78 100644 --- a/Makefile +++ b/Makefile @@ -153,7 +153,7 @@ define PARSE_RULE $$(eval $$(call PARSE_TEST)) # If the rule starts with the name of a known keyboard, then continue # the parsing from PARSE_KEYBOARD - else ifeq ($$(call TRY_TO_MATCH_RULE_FROM_LIST,$$(shell util/list_keyboards.sh | sort -u)),true) + else ifeq ($$(call TRY_TO_MATCH_RULE_FROM_LIST,$$(shell $(QMK_BIN) list-keyboards --no-resolve-defaults)),true) KEYBOARD_RULE=$$(MATCHED_ITEM) $$(eval $$(call PARSE_KEYBOARD,$$(MATCHED_ITEM))) else @@ -246,7 +246,7 @@ endef # if we are going to compile all keyboards, match the rest of the rule # for each of them define PARSE_ALL_KEYBOARDS - $$(eval $$(call PARSE_ALL_IN_LIST,PARSE_KEYBOARD,$(shell util/list_keyboards.sh | sort -u))) + $$(eval $$(call PARSE_ALL_IN_LIST,PARSE_KEYBOARD,$(shell $(QMK_BIN) list-keyboards --no-resolve-defaults))) endef # Prints a list of all known keymaps for the given keyboard @@ -443,11 +443,11 @@ git-submodules: git-submodule .PHONY: list-keyboards list-keyboards: - util/list_keyboards.sh | sort -u | tr '\n' ' ' + $(QMK_BIN) list-keyboards --no-resolve-defaults | tr '\n' ' ' .PHONY: generate-keyboards-file generate-keyboards-file: - util/list_keyboards.sh | sort -u + $(QMK_BIN) list-keyboards --no-resolve-defaults .PHONY: clean clean: |