masq
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Proper handling for running make from a subproject or keymap dir

This commit is contained in:
Fred Sundvik 2016-08-07 18:44:57 +03:00
parent 051017c312
commit 4f20061f66
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile
View File

@ -105,6 +105,15 @@ define PARSE_RULE
else ifeq ($$(call TRY_TO_MATCH_RULE_FROM_LIST,$$(KEYBOARDS)),true) else ifeq ($$(call TRY_TO_MATCH_RULE_FROM_LIST,$$(KEYBOARDS)),true)
$$(eval $$(call PARSE_KEYBOARD,$$(MATCHED_ITEM))) $$(eval $$(call PARSE_KEYBOARD,$$(MATCHED_ITEM)))
else ifneq ($$(KEYBOARD),) else ifneq ($$(KEYBOARD),)
# If there's no match in the beginning, then use the working directory instead
# First add the keymap to the commandline if we are in a keymap subdirectory
ifneq ($$(KEYMAP),)
RULE := $$(KEYMAP)-$$(RULE)
endif
# If we are in a subproject subdirectory add the subproject
ifneq ($$(SUBPROJECT),)
RULE := $$(SUBPROJECT)-$$(RULE)
endif
$$(eval $$(call PARSE_KEYBOARD,$$(KEYBOARD))) $$(eval $$(call PARSE_KEYBOARD,$$(KEYBOARD)))
else else
$$(info make: *** No rule to make target '$1'. Stop.) $$(info make: *** No rule to make target '$1'. Stop.)