diff options
| author | Christopher Browne <cbbrowne@ca.afilias.info> | 2016-06-20 12:20:52 -0400 |
|---|---|---|
| committer | Christopher Browne <cbbrowne@ca.afilias.info> | 2016-06-20 12:20:52 -0400 |
| commit | f6d1ce7863893e6dd0233c57f04b262f6808d78a (patch) | |
| tree | 723db2fdaff2ccf810a328511d7f54cbc568d326 /Makefile | |
| parent | f566125c6e29e3db62552c089428591d460ce583 (diff) | |
| parent | 44e098ef2d6c571cee9e5fa1b007b40f6289852f (diff) | |
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 10 |
1 files changed, 6 insertions, 4 deletions
@@ -2,8 +2,9 @@ ifndef VERBOSE .SILENT: endif -starting_makefile := $(abspath $(firstword $(MAKEFILE_LIST))) -mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST))) +space := $(subst ,, ) +starting_makefile := $(subst $(space),_SPACE_,$(abspath $(firstword $(MAKEFILE_LIST)))) +mkfile_path := $(subst $(space),_SPACE_,$(abspath $(lastword $(MAKEFILE_LIST)))) abs_tmk_root := $(patsubst %/,%,$(dir $(mkfile_path))) ifneq (,$(findstring /keyboard/,$(starting_makefile))) @@ -67,7 +68,7 @@ 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 @@ -79,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 |