diff options
author | skullydazed <skullydazed@users.noreply.github.com> | 2017-09-08 10:47:50 -0700 |
---|---|---|
committer | Jack Humbert <jack.humb@gmail.com> | 2017-09-08 13:47:50 -0400 |
commit | 4cdcbdb861589ae23902d0e9cadcf27453623a79 (patch) | |
tree | 070ff51a39fec70b20c489c5a5c91ef722ab2efb /Makefile | |
parent | cf8e10533b390b8204920013fc35ea74b400873a (diff) | |
download | qmk_firmware-4cdcbdb861589ae23902d0e9cadcf27453623a79.tar.gz qmk_firmware-4cdcbdb861589ae23902d0e9cadcf27453623a79.zip |
Remove all Makefiles from the keyboards directory. (#1660)
* Remove all Makefiles from the keyboards directory.
* update keymaps added in the last 8 days
* Ignore keyboard/keymap makefiles
* update hand_wire to reflect our new Makefile-less reality
* Update the make guide to reflect the new reality
* move planck keymap options to rules.mk
* update planck keymaps 4real
* trigger travis
* add back build_keyboard.mk
* restore changes to build_keyboard
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 10 |
1 files changed, 6 insertions, 4 deletions
@@ -89,7 +89,7 @@ ifeq ($(CURRENT_PATH_ELEMENT),keyboards) | |||
89 | endif | 89 | endif |
90 | 90 | ||
91 | # Only consider folders with makefiles, to prevent errors in case there are extra folders | 91 | # Only consider folders with makefiles, to prevent errors in case there are extra folders |
92 | KEYBOARDS := $(notdir $(patsubst %/Makefile,%,$(wildcard $(ROOT_DIR)/keyboards/*/Makefile))) | 92 | KEYBOARDS := $(notdir $(patsubst %/rules.mk,%,$(wildcard $(ROOT_DIR)/keyboards/*/rules.mk))) |
93 | 93 | ||
94 | #Compatibility with the old make variables, anything you specify directly on the command line | 94 | #Compatibility with the old make variables, anything you specify directly on the command line |
95 | # always overrides the detected folders | 95 | # always overrides the detected folders |
@@ -261,7 +261,7 @@ endef | |||
261 | define PARSE_KEYBOARD | 261 | define PARSE_KEYBOARD |
262 | CURRENT_KB := $1 | 262 | CURRENT_KB := $1 |
263 | # A subproject is any keyboard subfolder with a makefile | 263 | # A subproject is any keyboard subfolder with a makefile |
264 | SUBPROJECTS := $$(notdir $$(patsubst %/Makefile,%,$$(wildcard $(ROOT_DIR)/keyboards/$$(CURRENT_KB)/*/Makefile))) | 264 | SUBPROJECTS := $$(notdir $$(patsubst %/rules.mk,%,$$(wildcard $(ROOT_DIR)/keyboards/$$(CURRENT_KB)/*/rules.mk))) |
265 | # if the rule starts with allsp, then continue with looping over all subprojects | 265 | # if the rule starts with allsp, then continue with looping over all subprojects |
266 | ifeq ($$(call COMPARE_AND_REMOVE_FROM_RULE,allsp),true) | 266 | ifeq ($$(call COMPARE_AND_REMOVE_FROM_RULE,allsp),true) |
267 | $$(eval $$(call PARSE_ALL_SUBPROJECTS)) | 267 | $$(eval $$(call PARSE_ALL_SUBPROJECTS)) |
@@ -300,7 +300,9 @@ define PARSE_SUBPROJECT | |||
300 | endif | 300 | endif |
301 | ifeq ($$(CURRENT_SP),defaultsp) | 301 | ifeq ($$(CURRENT_SP),defaultsp) |
302 | SUBPROJECT_DEFAULT= | 302 | SUBPROJECT_DEFAULT= |
303 | $$(eval include $(ROOT_DIR)/keyboards/$$(CURRENT_KB)/Makefile) | 303 | ifneq ("$(wildcard $(ROOT_DIR)/keyboards/$$(CURRENT_KB)/subproject.mk)","") |
304 | $$(eval include $(ROOT_DIR)/keyboards/$$(CURRENT_KB)/subproject.mk) | ||
305 | endif | ||
304 | CURRENT_SP := $$(SUBPROJECT_DEFAULT) | 306 | CURRENT_SP := $$(SUBPROJECT_DEFAULT) |
305 | endif | 307 | endif |
306 | # If current subproject is empty (the default was not defined), and we have a list of subproject | 308 | # If current subproject is empty (the default was not defined), and we have a list of subproject |
@@ -503,7 +505,7 @@ if [ $$error_occurred -gt 0 ]; then $(HANDLE_ERROR); fi; | |||
503 | endef | 505 | endef |
504 | 506 | ||
505 | # Allow specifying just the subproject, in the keyboard directory, which will compile all keymaps | 507 | # Allow specifying just the subproject, in the keyboard directory, which will compile all keymaps |
506 | SUBPROJECTS := $(notdir $(patsubst %/Makefile,%,$(wildcard ./*/Makefile))) | 508 | SUBPROJECTS := $(notdir $(patsubst %/rules.mk,%,$(wildcard ./*/rules.mk))) |
507 | .PHONY: $(SUBPROJECTS) | 509 | .PHONY: $(SUBPROJECTS) |
508 | $(SUBPROJECTS): %: %-allkm | 510 | $(SUBPROJECTS): %: %-allkm |
509 | 511 | ||