summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFred Sundvik <fsundvik@gmail.com>2016-08-07 16:02:14 +0300
committerFred Sundvik <fsundvik@gmail.com>2016-08-20 03:24:40 +0300
commit091fab5103bd896f1b36094a7337dbe2f9d2ad59 (patch)
tree6bc5b9824e0b8976bb98b2491a28dbaa2e25b1d2
parent286b3b8057630bf9ce78d3a0aaa24f4841b37b3e (diff)
Slight rearrange of the Makefile for easier readability
-rw-r--r--Makefile54
1 files changed, 27 insertions, 27 deletions
diff --git a/Makefile b/Makefile
index 8f7dbb9e6c..a034213653 100644
--- a/Makefile
+++ b/Makefile
@@ -94,20 +94,30 @@ define PARSE_ALL_IN_LIST
$$(foreach ITEM$1,$2,$$(eval $$(call ALL_IN_LIST_LOOP,$1)))
endef
-define PARSE_ALL_KEYBOARDS
- $$(eval $$(call PARSE_ALL_IN_LIST,PARSE_KEYBOARD,$(KEYBOARDS)))
+define PARSE_RULE
+ RULE := $1
+ COMMANDS :=
+ ifeq ($$(call COMPARE_AND_REMOVE_FROM_RULE,allkb),true)
+ $$(eval $$(call PARSE_ALL_KEYBOARDS))
+ else ifeq ($$(call TRY_TO_MATCH_RULE_FROM_LIST,$$(KEYBOARDS)),true)
+ $$(eval $$(call PARSE_KEYBOARD,$$(MATCHED_ITEM)))
+ endif
endef
-define PARSE_ALL_KEYMAPS
- $$(eval $$(call PARSE_ALL_IN_LIST,PARSE_KEYMAP,$$(KEYMAPS)))
+# $1 = Keyboard
+define PARSE_KEYBOARD
+ CURRENT_KB := $1
+ # A subproject is any keyboard subfolder with a makefile
+ SUBPROJECTS := $$(notdir $$(patsubst %/Makefile,%,$$(wildcard $(ROOT_DIR)/keyboards/$$(CURRENT_KB)/*/Makefile)))
+ ifeq ($$(call COMPARE_AND_REMOVE_FROM_RULE,allsp),true)
+ $$(eval $$(call PARSE_ALL_SUBPROJECTS))
+ else ifeq ($$(call TRY_TO_MATCH_RULE_FROM_LIST,$$(SUBPROJECTS)),true)
+ $$(eval $$(call PARSE_SUBPROJECT,$$(MATCHED_ITEM)))
+ endif
endef
-define PARSE_ALL_SUBPROJECTS
- ifeq ($$(SUBPROJECTS),)
- $$(eval $$(call PARSE_SUBPROJECT,))
- else
- $$(eval $$(call PARSE_ALL_IN_LIST,PARSE_SUBPROJECT,$$(SUBPROJECTS)))
- endif
+define PARSE_ALL_KEYBOARDS
+ $$(eval $$(call PARSE_ALL_IN_LIST,PARSE_KEYBOARD,$(KEYBOARDS)))
endef
# $1 Subproject
@@ -121,15 +131,11 @@ define PARSE_SUBPROJECT
endif
endef
-# $1 = Keyboard
-define PARSE_KEYBOARD
- CURRENT_KB := $1
- # A subproject is any keyboard subfolder with a makefile
- SUBPROJECTS := $$(notdir $$(patsubst %/Makefile,%,$$(wildcard $(ROOT_DIR)/keyboards/$$(CURRENT_KB)/*/Makefile)))
- ifeq ($$(call COMPARE_AND_REMOVE_FROM_RULE,allsp),true)
- $$(eval $$(call PARSE_ALL_SUBPROJECTS))
- else ifeq ($$(call TRY_TO_MATCH_RULE_FROM_LIST,$$(SUBPROJECTS)),true)
- $$(eval $$(call PARSE_SUBPROJECT,$$(MATCHED_ITEM)))
+define PARSE_ALL_SUBPROJECTS
+ ifeq ($$(SUBPROJECTS),)
+ $$(eval $$(call PARSE_SUBPROJECT,))
+ else
+ $$(eval $$(call PARSE_ALL_IN_LIST,PARSE_SUBPROJECT,$$(SUBPROJECTS)))
endif
endef
@@ -140,14 +146,8 @@ define PARSE_KEYMAP
COMMAND_KEYBOARD_$$(CURRENT_KB)_SUBPROJECT_$(CURRENT_SP)_KEYMAP_$$(CURRENT_KM) := Keyboard $$(CURRENT_KB), Subproject $$(CURRENT_SP), Keymap $$(CURRENT_KM)
endef
-define PARSE_RULE
- RULE := $1
- COMMANDS :=
- ifeq ($$(call COMPARE_AND_REMOVE_FROM_RULE,allkb),true)
- $$(eval $$(call PARSE_ALL_KEYBOARDS))
- else ifeq ($$(call TRY_TO_MATCH_RULE_FROM_LIST,$$(KEYBOARDS)),true)
- $$(eval $$(call PARSE_KEYBOARD,$$(MATCHED_ITEM)))
- endif
+define PARSE_ALL_KEYMAPS
+ $$(eval $$(call PARSE_ALL_IN_LIST,PARSE_KEYMAP,$$(KEYMAPS)))
endef
RUN_COMMAND = echo "Running": $(COMMAND_$(COMMAND));