summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJoel Challis <git@zvecr.com>2023-01-03 03:15:29 +0000
committerGitHub <noreply@github.com>2023-01-03 14:15:29 +1100
commitc345278101b3882a2f33b078021ab31a6129120a (patch)
tree3b5bc671cf95fc56cc9e5eea2b62d223e44f321e /Makefile
parent44800f119d330bb0f02f3d13c36cafe57adc20ee (diff)
Replace list_keyboards.sh with CLI calls (#19485)
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile8
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
153 $$(eval $$(call PARSE_TEST)) 153 $$(eval $$(call PARSE_TEST))
154 # If the rule starts with the name of a known keyboard, then continue 154 # If the rule starts with the name of a known keyboard, then continue
155 # the parsing from PARSE_KEYBOARD 155 # the parsing from PARSE_KEYBOARD
156 else ifeq ($$(call TRY_TO_MATCH_RULE_FROM_LIST,$$(shell util/list_keyboards.sh | sort -u)),true) 156 else ifeq ($$(call TRY_TO_MATCH_RULE_FROM_LIST,$$(shell $(QMK_BIN) list-keyboards --no-resolve-defaults)),true)
157 KEYBOARD_RULE=$$(MATCHED_ITEM) 157 KEYBOARD_RULE=$$(MATCHED_ITEM)
158 $$(eval $$(call PARSE_KEYBOARD,$$(MATCHED_ITEM))) 158 $$(eval $$(call PARSE_KEYBOARD,$$(MATCHED_ITEM)))
159 else 159 else
@@ -246,7 +246,7 @@ endef
246# if we are going to compile all keyboards, match the rest of the rule 246# if we are going to compile all keyboards, match the rest of the rule
247# for each of them 247# for each of them
248define PARSE_ALL_KEYBOARDS 248define PARSE_ALL_KEYBOARDS
249 $$(eval $$(call PARSE_ALL_IN_LIST,PARSE_KEYBOARD,$(shell util/list_keyboards.sh | sort -u))) 249 $$(eval $$(call PARSE_ALL_IN_LIST,PARSE_KEYBOARD,$(shell $(QMK_BIN) list-keyboards --no-resolve-defaults)))
250endef 250endef
251 251
252# Prints a list of all known keymaps for the given keyboard 252# Prints a list of all known keymaps for the given keyboard
@@ -443,11 +443,11 @@ git-submodules: git-submodule
443 443
444.PHONY: list-keyboards 444.PHONY: list-keyboards
445list-keyboards: 445list-keyboards:
446 util/list_keyboards.sh | sort -u | tr '\n' ' ' 446 $(QMK_BIN) list-keyboards --no-resolve-defaults | tr '\n' ' '
447 447
448.PHONY: generate-keyboards-file 448.PHONY: generate-keyboards-file
449generate-keyboards-file: 449generate-keyboards-file:
450 util/list_keyboards.sh | sort -u 450 $(QMK_BIN) list-keyboards --no-resolve-defaults
451 451
452.PHONY: clean 452.PHONY: clean
453clean: 453clean: