aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorFred Sundvik <fsundvik@gmail.com>2016-08-14 12:25:23 +0300
committerFred Sundvik <fsundvik@gmail.com>2016-08-20 03:56:38 +0300
commit87bf34a5d341c3a2381f57c19fcb94c21c8d0122 (patch)
tree7543a5f3882d717305f56147c99c7c79aaecc285 /Makefile
parentd924eb591ebcfb603f8941763de9616ce4b1554c (diff)
downloadqmk_firmware-87bf34a5d341c3a2381f57c19fcb94c21c8d0122.tar.gz
qmk_firmware-87bf34a5d341c3a2381f57c19fcb94c21c8d0122.zip
Pass the target to submake
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile10
1 files changed, 8 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 319684c83..ed89b0733 100644
--- a/Makefile
+++ b/Makefile
@@ -230,6 +230,9 @@ endef
230# $1 Keymap 230# $1 Keymap
231define PARSE_KEYMAP 231define PARSE_KEYMAP
232 CURRENT_KM = $1 232 CURRENT_KM = $1
233 # The rest of the rule is the target
234 # Remove the leading "-" from the target, as it acts as a separator
235 MAKE_TARGET := $$(patsubst -%,%,$$(RULE))
233 COMMAND := COMMAND_KEYBOARD_$$(CURRENT_KB)_SUBPROJECT_$(CURRENT_SP)_KEYMAP_$$(CURRENT_KM) 236 COMMAND := COMMAND_KEYBOARD_$$(CURRENT_KB)_SUBPROJECT_$(CURRENT_SP)_KEYMAP_$$(CURRENT_KM)
234 COMMANDS += $$(COMMAND) 237 COMMANDS += $$(COMMAND)
235 ifeq ($$(CURRENT_SP),) 238 ifeq ($$(CURRENT_SP),)
@@ -240,8 +243,11 @@ define PARSE_KEYMAP
240 KB_SP := $(BOLD)$$(KB_SP)$(NO_COLOR) 243 KB_SP := $(BOLD)$$(KB_SP)$(NO_COLOR)
241 MAKE_VARS := KEYBOARD=$$(CURRENT_KB) SUBPROJECT=$$(CURRENT_SP) KEYMAP=$$(CURRENT_KM) 244 MAKE_VARS := KEYBOARD=$$(CURRENT_KB) SUBPROJECT=$$(CURRENT_SP) KEYMAP=$$(CURRENT_KM)
242 MAKE_VARS += VERBOSE=$(VERBOSE) COLOR=$(COLOR) 245 MAKE_VARS += VERBOSE=$(VERBOSE) COLOR=$(COLOR)
243 MAKE_CMD := $$(MAKE) -r -R -C $(ROOT_DIR) -f build_keyboard.mk 246 MAKE_CMD := $$(MAKE) -r -R -C $(ROOT_DIR) -f build_keyboard.mk $$(MAKE_TARGET)
244 MAKE_MSG := Compiling $$(KB_SP) with $(BOLD)$$(CURRENT_KM)$(NO_COLOR) 247 MAKE_MSG := Making $$(KB_SP) with keymap $(BOLD)$$(CURRENT_KM)$(NO_COLOR)
248 ifneq ($$(MAKE_TARGET),)
249 MAKE_MSG += and target $(BOLD)$$(MAKE_TARGET)$(NO_COLOR)
250 endif
245 MAKE_MSG_FORMAT := $(AWK) '{ printf "%-118s", $$$$0;}' 251 MAKE_MSG_FORMAT := $(AWK) '{ printf "%-118s", $$$$0;}'
246 COMMAND_true_$$(COMMAND) := \ 252 COMMAND_true_$$(COMMAND) := \
247 printf "$$(MAKE_MSG)" | \ 253 printf "$$(MAKE_MSG)" | \