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) | |
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
diff --git a/Makefile b/Makefile index f79244951c..1ca9876a28 100644 --- a/Makefile +++ b/Makefile @@ -89,7 +89,7 @@ ifeq ($(CURRENT_PATH_ELEMENT),keyboards) endif # Only consider folders with makefiles, to prevent errors in case there are extra folders -KEYBOARDS := $(notdir $(patsubst %/Makefile,%,$(wildcard $(ROOT_DIR)/keyboards/*/Makefile))) +KEYBOARDS := $(notdir $(patsubst %/rules.mk,%,$(wildcard $(ROOT_DIR)/keyboards/*/rules.mk))) #Compatibility with the old make variables, anything you specify directly on the command line # always overrides the detected folders @@ -261,7 +261,7 @@ endef 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))) + SUBPROJECTS := $$(notdir $$(patsubst %/rules.mk,%,$$(wildcard $(ROOT_DIR)/keyboards/$$(CURRENT_KB)/*/rules.mk))) # if the rule starts with allsp, then continue with looping over all subprojects ifeq ($$(call COMPARE_AND_REMOVE_FROM_RULE,allsp),true) $$(eval $$(call PARSE_ALL_SUBPROJECTS)) @@ -300,7 +300,9 @@ define PARSE_SUBPROJECT endif ifeq ($$(CURRENT_SP),defaultsp) SUBPROJECT_DEFAULT= - $$(eval include $(ROOT_DIR)/keyboards/$$(CURRENT_KB)/Makefile) + ifneq ("$(wildcard $(ROOT_DIR)/keyboards/$$(CURRENT_KB)/subproject.mk)","") + $$(eval include $(ROOT_DIR)/keyboards/$$(CURRENT_KB)/subproject.mk) + endif CURRENT_SP := $$(SUBPROJECT_DEFAULT) endif # 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; endef # Allow specifying just the subproject, in the keyboard directory, which will compile all keymaps -SUBPROJECTS := $(notdir $(patsubst %/Makefile,%,$(wildcard ./*/Makefile))) +SUBPROJECTS := $(notdir $(patsubst %/rules.mk,%,$(wildcard ./*/rules.mk))) .PHONY: $(SUBPROJECTS) $(SUBPROJECTS): %: %-allkm |