summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJoel Challis <git@zvecr.com>2022-02-10 17:45:51 +0000
committerGitHub <noreply@github.com>2022-02-10 09:45:51 -0800
commitf7e7671f691cfd42f322198f04690727f6493d73 (patch)
tree9c705a6a1a594263ab273cba62affa3fa7e5d28e /Makefile
parent7a0fd646e37795aa843d369a5c80d99118cca868 (diff)
Migrate more makefile utilities to builddefs sub-directory (#16002)
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 22c79880a3..4c2e6a04dc 100644
--- a/Makefile
+++ b/Makefile
@@ -275,7 +275,7 @@ define PARSE_KEYMAP
275 # Specify the variables that we are passing forward to submake 275 # Specify the variables that we are passing forward to submake
276 MAKE_VARS := KEYBOARD=$$(CURRENT_KB) KEYMAP=$$(CURRENT_KM) REQUIRE_PLATFORM_KEY=$$(REQUIRE_PLATFORM_KEY) QMK_BIN=$$(QMK_BIN) 276 MAKE_VARS := KEYBOARD=$$(CURRENT_KB) KEYMAP=$$(CURRENT_KM) REQUIRE_PLATFORM_KEY=$$(REQUIRE_PLATFORM_KEY) QMK_BIN=$$(QMK_BIN)
277 # And the first part of the make command 277 # And the first part of the make command
278 MAKE_CMD := $$(MAKE) -r -R -C $(ROOT_DIR) -f build_keyboard.mk $$(MAKE_TARGET) 278 MAKE_CMD := $$(MAKE) -r -R -C $(ROOT_DIR) -f $(BUILDDEFS_PATH)/build_keyboard.mk $$(MAKE_TARGET)
279 # The message to display 279 # The message to display
280 MAKE_MSG := $$(MSG_MAKE_KB) 280 MAKE_MSG := $$(MSG_MAKE_KB)
281 # We run the command differently, depending on if we want more output or not 281 # We run the command differently, depending on if we want more output or not
@@ -317,7 +317,7 @@ define BUILD_TEST
317 TEST_NAME := $$(notdir $$(TEST_PATH)) 317 TEST_NAME := $$(notdir $$(TEST_PATH))
318 MAKE_TARGET := $2 318 MAKE_TARGET := $2
319 COMMAND := $1 319 COMMAND := $1
320 MAKE_CMD := $$(MAKE) -r -R -C $(ROOT_DIR) -f build_test.mk $$(MAKE_TARGET) 320 MAKE_CMD := $$(MAKE) -r -R -C $(ROOT_DIR) -f $(BUILDDEFS_PATH)/build_test.mk $$(MAKE_TARGET)
321 MAKE_VARS := TEST=$$(TEST_NAME) TEST_PATH=$$(TEST_PATH) FULL_TESTS="$$(FULL_TESTS)" 321 MAKE_VARS := TEST=$$(TEST_NAME) TEST_PATH=$$(TEST_PATH) FULL_TESTS="$$(FULL_TESTS)"
322 MAKE_MSG := $$(MSG_MAKE_TEST) 322 MAKE_MSG := $$(MSG_MAKE_TEST)
323 $$(eval $$(call BUILD)) 323 $$(eval $$(call BUILD))
@@ -339,7 +339,7 @@ define PARSE_TEST
339 TESTS := 339 TESTS :=
340 TEST_NAME := $$(firstword $$(subst :, ,$$(RULE))) 340 TEST_NAME := $$(firstword $$(subst :, ,$$(RULE)))
341 TEST_TARGET := $$(subst $$(TEST_NAME),,$$(subst $$(TEST_NAME):,,$$(RULE))) 341 TEST_TARGET := $$(subst $$(TEST_NAME),,$$(subst $$(TEST_NAME):,,$$(RULE)))
342 include $(ROOT_DIR)/testlist.mk 342 include $(BUILDDEFS_PATH)/testlist.mk
343 ifeq ($$(TEST_NAME),all) 343 ifeq ($$(TEST_NAME),all)
344 MATCHED_TESTS := $$(TEST_LIST) 344 MATCHED_TESTS := $$(TEST_LIST)
345 else 345 else