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 /build_keyboard.mk | |
| parent | cf8e10533b390b8204920013fc35ea74b400873a (diff) | |
| download | qmk_firmware-4cdcbdb861589ae23902d0e9cadcf27453623a79.tar.gz | |
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 'build_keyboard.mk')
| -rw-r--r-- | build_keyboard.mk | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/build_keyboard.mk b/build_keyboard.mk index e8e21f2ba..88b876bac 100644 --- a/build_keyboard.mk +++ b/build_keyboard.mk @@ -91,11 +91,11 @@ MAIN_KEYMAP_C := $(MAIN_KEYMAP_PATH)/keymap.c SUBPROJ_KEYMAP_PATH := $(SUBPROJECT_PATH)/keymaps/$(KEYMAP) SUBPROJ_KEYMAP_C := $(SUBPROJ_KEYMAP_PATH)/keymap.c ifneq ("$(wildcard $(SUBPROJ_KEYMAP_C))","") - -include $(SUBPROJ_KEYMAP_PATH)/Makefile + -include $(SUBPROJ_KEYMAP_PATH)/rules.mk KEYMAP_C := $(SUBPROJ_KEYMAP_C) KEYMAP_PATH := $(SUBPROJ_KEYMAP_PATH) else ifneq ("$(wildcard $(MAIN_KEYMAP_C))","") - -include $(MAIN_KEYMAP_PATH)/Makefile + -include $(MAIN_KEYMAP_PATH)/rules.mk KEYMAP_C := $(MAIN_KEYMAP_C) KEYMAP_PATH := $(MAIN_KEYMAP_PATH) else ifneq ($(LAYOUTS),) @@ -181,4 +181,3 @@ build: elf hex include $(TMK_PATH)/rules.mk - |