diff options
| author | Joel Challis <git@zvecr.com> | 2021-10-18 00:15:26 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-18 00:15:26 +0100 |
| commit | ad2b017ee63ca3719ce1051b0878b7aba8fcbc92 (patch) | |
| tree | a86958840133df675f1b3c2e741124c2a2333987 | |
| parent | bd2f8ab88a8d1598cde47d3238ae8a49f1d7fbf9 (diff) | |
| download | qmk_firmware-ad2b017ee63ca3719ce1051b0878b7aba8fcbc92.tar.gz qmk_firmware-ad2b017ee63ca3719ce1051b0878b7aba8fcbc92.zip | |
Remove legacy Makefile functionality (#14858)
| -rw-r--r-- | Makefile | 29 |
1 files changed, 0 insertions, 29 deletions
| @@ -54,8 +54,6 @@ BUILD_DIR := $(ROOT_DIR)/.build | |||
| 54 | TEST_DIR := $(BUILD_DIR)/test | 54 | TEST_DIR := $(BUILD_DIR)/test |
| 55 | ERROR_FILE := $(BUILD_DIR)/error_occurred | 55 | ERROR_FILE := $(BUILD_DIR)/error_occurred |
| 56 | 56 | ||
| 57 | MAKEFILE_INCLUDED=yes | ||
| 58 | |||
| 59 | # Helper function to process the newt element of a space separated path | 57 | # Helper function to process the newt element of a space separated path |
| 60 | # It works a bit like the traditional functional head tail | 58 | # It works a bit like the traditional functional head tail |
| 61 | # so the CURRENT_PATH_ELEMENT will become the new head | 59 | # so the CURRENT_PATH_ELEMENT will become the new head |
| @@ -93,31 +91,8 @@ distclean: clean | |||
| 93 | rm -f *.bin *.hex *.uf2 | 91 | rm -f *.bin *.hex *.uf2 |
| 94 | echo 'done.' | 92 | echo 'done.' |
| 95 | 93 | ||
| 96 | #Compatibility with the old make variables, anything you specify directly on the command line | ||
| 97 | # always overrides the detected folders | ||
| 98 | ifdef keyboard | ||
| 99 | KEYBOARD := $(keyboard) | ||
| 100 | endif | ||
| 101 | ifdef keymap | ||
| 102 | KEYMAP := $(keymap) | ||
| 103 | endif | ||
| 104 | |||
| 105 | # Uncomment these for debugging | ||
| 106 | # $(info Keyboard: $(KEYBOARD)) | ||
| 107 | # $(info Keymap: $(KEYMAP)) | ||
| 108 | |||
| 109 | 94 | ||
| 110 | # Set the default goal depending on where we are running make from | ||
| 111 | # this handles the case where you run make without any arguments | ||
| 112 | .DEFAULT_GOAL := all:all | 95 | .DEFAULT_GOAL := all:all |
| 113 | ifneq ($(KEYMAP),) | ||
| 114 | .DEFAULT_GOAL := $(KEYBOARD):$(KEYMAP) | ||
| 115 | else ifneq ($(KEYBOARD),) | ||
| 116 | # Inside a keyboard folder, build all keymaps for all subprojects | ||
| 117 | # Note that this is different from the old behaviour, which would | ||
| 118 | # build only the default keymap of the default keyboard | ||
| 119 | .DEFAULT_GOAL := $(KEYBOARD):all | ||
| 120 | endif | ||
| 121 | 96 | ||
| 122 | 97 | ||
| 123 | # Compare the start of the RULE variable with the first argument($1) | 98 | # Compare the start of the RULE variable with the first argument($1) |
| @@ -241,10 +216,6 @@ define PARSE_RULE | |||
| 241 | else ifeq ($$(call TRY_TO_MATCH_RULE_FROM_LIST,$$(shell util/list_keyboards.sh | sort -u)),true) | 216 | else ifeq ($$(call TRY_TO_MATCH_RULE_FROM_LIST,$$(shell util/list_keyboards.sh | sort -u)),true) |
| 242 | KEYBOARD_RULE=$$(MATCHED_ITEM) | 217 | KEYBOARD_RULE=$$(MATCHED_ITEM) |
| 243 | $$(eval $$(call PARSE_KEYBOARD,$$(MATCHED_ITEM))) | 218 | $$(eval $$(call PARSE_KEYBOARD,$$(MATCHED_ITEM))) |
| 244 | # Otherwise use the KEYBOARD variable, which is determined either by | ||
| 245 | # the current directory you run make from, or passed in as an argument | ||
| 246 | else ifneq ($$(KEYBOARD),) | ||
| 247 | $$(eval $$(call PARSE_KEYBOARD,$$(KEYBOARD))) | ||
| 248 | else | 219 | else |
| 249 | $$(info make: *** No rule to make target '$1'. Stop.) | 220 | $$(info make: *** No rule to make target '$1'. Stop.) |
| 250 | $$(info |) | 221 | $$(info |) |
