diff options
| author | Jack Humbert <jack.humb@gmail.com> | 2016-06-22 04:39:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-22 04:39:54 +0200 |
| commit | 649b33d7783cf3021928534b7ae127e0a89e8807 (patch) | |
| tree | c2b5e0cf8ff4aa2918e3b88ab75dbdb071cc0a1d /tmk_core/rules.mk | |
| parent | 464c8e274f993d3571fe5ea5e836fe55a3912ffe (diff) | |
| download | qmk_firmware-649b33d7783cf3021928534b7ae127e0a89e8807.tar.gz qmk_firmware-649b33d7783cf3021928534b7ae127e0a89e8807.tar.xz | |
Renames keyboard folder to keyboards, adds couple of tmk's fixes (#432)
* fixes from tmk's repo
* rename keyboard to keyboards
Diffstat (limited to 'tmk_core/rules.mk')
| -rw-r--r-- | tmk_core/rules.mk | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tmk_core/rules.mk b/tmk_core/rules.mk index e9ef5ca7b..07700283e 100644 --- a/tmk_core/rules.mk +++ b/tmk_core/rules.mk @@ -622,7 +622,7 @@ show_path: @echo VPATH=$(VPATH) @echo SRC=$(SRC) -SUBDIRS := $(sort $(dir $(wildcard $(TOP_DIR)/keyboard/*/.))) +SUBDIRS := $(sort $(dir $(wildcard $(TOP_DIR)/keyboards/*/.))) all-keyboards-defaults-%: @for x in $(SUBDIRS) ; do \ printf "Compiling with default: $$x" | $(AWK_CMD); \ @@ -631,14 +631,14 @@ all-keyboards-defaults-%: all-keyboards-defaults: all-keyboards-defaults-all -KEYBOARDS := $(SUBDIRS:$(TOP_DIR)/keyboard/%/=/keyboard/%) +KEYBOARDS := $(SUBDIRS:$(TOP_DIR)/keyboards/%/=/keyboards/%) all-keyboards-all: $(addsuffix -all,$(KEYBOARDS)) all-keyboards-quick: $(addsuffix -quick,$(KEYBOARDS)) all-keyboards-clean: $(addsuffix -clean,$(KEYBOARDS)) all-keyboards: all-keyboards-all define make_keyboard -$(eval KEYBOARD=$(patsubst /keyboard/%,%,$1)) +$(eval KEYBOARD=$(patsubst /keyboards/%,%,$1)) $(eval KEYMAPS=$(notdir $(patsubst %/.,%,$(wildcard $(TOP_DIR)$1/keymaps/*/.)))) @for x in $(KEYMAPS) ; do \ printf "Compiling $(BOLD)$(KEYBOARD)$(NO_COLOR) with $(BOLD)$$x$(NO_COLOR)" | $(AWK) '{ printf "%-88s", $$0; }'; \ @@ -651,18 +651,18 @@ define make_keyboard_helper $(call make_keyboard,$(subst -$2,,$1),$2) endef -/keyboard/%-quick: +/keyboards/%-quick: $(call make_keyboard_helper,$@,quick) -/keyboard/%-all: +/keyboards/%-all: $(call make_keyboard_helper,$@,all) -/keyboard/%-clean: +/keyboards/%-clean: $(call make_keyboard_helper,$@,clean) -/keyboard/%: +/keyboards/%: $(call make_keyboard_helper,$@,all) all-keymaps-%: $(eval MAKECONFIG=$(call get_target,all-keymaps,$@)) - $(eval KEYMAPS=$(notdir $(patsubst %/.,%,$(wildcard $(TOP_DIR)/keyboard/$(KEYBOARD)/keymaps/*/.)))) + $(eval KEYMAPS=$(notdir $(patsubst %/.,%,$(wildcard $(TOP_DIR)/keyboards/$(KEYBOARD)/keymaps/*/.)))) @for x in $(KEYMAPS) ; do \ printf "Compiling $(BOLD)$(KEYBOARD)$(NO_COLOR) with $(BOLD)$$x$(NO_COLOR)" | $(AWK) '{ printf "%-88s", $$0; }'; \ LOG=$$($(MAKE) $(subst all-keymaps-,,$@) keyboard=$(KEYBOARD) keymap=$$x VERBOSE=$(VERBOSE) COLOR=$(COLOR) SILENT=true 2>&1) ; if [ $$? -gt 0 ]; then $(PRINT_ERROR_PLAIN); elif [ "$$LOG" != "" ] ; then $(PRINT_WARNING_PLAIN); else $(PRINT_OK); fi; \ |