]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
Print error message when trying to build non-existing keymap
authorFred Sundvik <fsundvik@gmail.com>
Sun, 7 Aug 2016 15:12:45 +0000 (18:12 +0300)
committerFred Sundvik <fsundvik@gmail.com>
Sat, 20 Aug 2016 00:56:20 +0000 (03:56 +0300)
Makefile

index 028d143930fc24a3eeedb7d433b4dd7a67a2637d..a9a2d98fcbd0f5aa109ba136da28cf69810cd187 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -39,7 +39,8 @@ ifeq ($(CURRENT_PATH_ELEMENT),keyboards)
 endif
 
 $(info $(ROOT_DIR)/keyboards)
-KEYBOARDS := $(notdir $(patsubst %/.,%,$(wildcard $(ROOT_DIR)/keyboards/*/.)))
+# Only consider folders with makefiles, to prevent errors in case there are extra folders
+KEYBOARDS := $(notdir $(patsubst %/Makefile,%,$(wildcard $(ROOT_DIR)/keyboards/*/Makefile)))
 
 $(info Keyboard: $(KEYBOARD))
 $(info Keymap: $(KEYMAP))
@@ -154,6 +155,13 @@ define PARSE_SUBPROJECT
             $$(eval $$(call PARSE_ALL_KEYMAPS))
         else ifeq ($$(call TRY_TO_MATCH_RULE_FROM_LIST,$$(KEYMAPS)),true)
             $$(eval $$(call PARSE_KEYMAP,$$(MATCHED_ITEM)))
+        else
+            ifeq ($$(CURRENT_SP),)
+                $$(info make: *** No rule to make target '$$(CURRENT_KB)-$$(RULE)'. Stop.)
+            else
+                $$(info make: *** No rule to make target '$$(CURRENT_KB)-$$(CURRENT_SP)-$$(RULE)'. Stop.)
+            endif
+                       exit 1
         endif
     else
         $$(eval $$(call PARSE_ALL_IN_LIST,PARSE_SUBPROJECT,$(SUBPROJECTS)))