Renames keyboard folder to keyboards, adds couple of tmk's fixes (#432)

[qmk_firmware.git] / Makefile

diff --git a/Makefile b/Makefile
index b1e77102e0f52ae748b01881c1956b04c6043d64..93e8fc4045b644674154d8372a2c3547a601569f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -7,8 +7,8 @@ starting_makefile := $(subst $(space),_SPACE_,$(abspath $(firstword $(MAKEFILE_L
 mkfile_path := $(subst $(space),_SPACE_,$(abspath $(lastword $(MAKEFILE_LIST))))
 abs_tmk_root := $(patsubst %/,%,$(dir $(mkfile_path)))
 
-ifneq (,$(findstring /keyboard/,$(starting_makefile)))
-       possible_keyboard:=$(patsubst %/,%,$(dir $(patsubst $(abs_tmk_root)/keyboard/%,%,$(starting_makefile))))
+ifneq (,$(findstring /keyboards/,$(starting_makefile)))
+       possible_keyboard:=$(patsubst %/,%,$(dir $(patsubst $(abs_tmk_root)/keyboards/%,%,$(starting_makefile))))
        ifneq (,$(findstring /keymaps/,$(possible_keyboard)))
                KEYBOARD_DIR:=$(firstword $(subst /keymaps/, ,$(possible_keyboard)))
                KEYMAP_DIR:=$(lastword $(subst /keymaps/, ,$(possible_keyboard)))
@@ -41,9 +41,9 @@ endif
 ifndef KEYBOARD
        KEYBOARD=planck
 endif
-KEYBOARD_PATH = $(TOP_DIR)/keyboard/$(KEYBOARD)
+KEYBOARD_PATH = $(TOP_DIR)/keyboards/$(KEYBOARD)
 ifneq ("$(wildcard $(KEYBOARD_PATH)/$(KEYBOARD).c)","")
-       KEYBOARD_FILE = keyboard/$(KEYBOARD)/$(KEYBOARD).c
+       KEYBOARD_FILE = keyboards/$(KEYBOARD)/$(KEYBOARD).c
        ifndef ARCH
                include $(KEYBOARD_PATH)/Makefile
        endif
@@ -62,13 +62,13 @@ ifndef KEYMAP
 endif
 KEYMAP_PATH = $(KEYBOARD_PATH)/keymaps/$(KEYMAP)
 ifneq ("$(wildcard $(KEYMAP_PATH)/keymap.c)","")
-       KEYMAP_FILE = keyboard/$(KEYBOARD)/keymaps/$(KEYMAP)/keymap.c
+       KEYMAP_FILE = keyboards/$(KEYBOARD)/keymaps/$(KEYMAP)/keymap.c
        -include $(KEYMAP_PATH)/Makefile
 else 
 $(error "$(KEYMAP_PATH)/keymap.c" does not exist)
 endif
 
-TARGET = $(KEYBOARD)_$(KEYMAP)
+TARGET ?= $(KEYBOARD)_$(KEYMAP)
 
 ifneq ("$(wildcard $(KEYMAP_PATH)/config.h)","")
        CONFIG_H = $(KEYMAP_PATH)/config.h
@@ -80,7 +80,8 @@ endif
 SRC += $(KEYBOARD_FILE) \
        $(KEYMAP_FILE) \
        $(QUANTUM_DIR)/quantum.c \
-       $(QUANTUM_DIR)/keymap_common.c \
+       $(QUANTUM_DIR)/keymap.c \
+       $(QUANTUM_DIR)/keycode_config.c \
        $(QUANTUM_DIR)/led.c
 
 ifndef CUSTOM_MATRIX