adds handwire and onekey example

[qmk_firmware.git] / Makefile

diff --git a/Makefile b/Makefile
index 5642aa2839a4f24fb84c2d1ba18709d4057ca43b..f9b865b9f8f4778b527b2bced8e93a20638ea018 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -65,22 +65,24 @@ endif
 
 KEYBOARD_PATH = $(TOP_DIR)/keyboards/$(KEYBOARD)
 
+ifdef sub
+       SUBPROJECT=$(sub)
+endif
+ifdef subproject
+       SUBPROJECT=$(subproject)
+endif
+
 ifneq ("$(wildcard $(KEYBOARD_PATH)/$(KEYBOARD).c)","")
        KEYBOARD_FILE = keyboards/$(KEYBOARD)/$(KEYBOARD).c
        ifndef ARCH
-               include $(KEYBOARD_PATH)/Makefile
+               ifneq ("$(wildcard $(KEYBOARD_PATH)/Makefile)","")
+                       include $(KEYBOARD_PATH)/Makefile
+               endif
        endif
 else 
 $(error "$(KEYBOARD_PATH)/$(KEYBOARD).c" does not exist)
 endif
 
-ifdef sub
-       SUBPROJECT=$(sub)
-endif
-ifdef subproject
-       SUBPROJECT=$(subproject)
-endif
-
 ifdef SUBPROJECT_DEFAULT
        SUBPROJECT?=$(SUBPROJECT_DEFAULT)
 endif
@@ -110,7 +112,13 @@ ifneq ("$(wildcard $(KEYMAP_PATH)/keymap.c)","")
        KEYMAP_FILE = keyboards/$(KEYBOARD)/keymaps/$(KEYMAP)/keymap.c
        -include $(KEYMAP_PATH)/Makefile
 else 
+       ifeq ("$(wildcard $(SUBPROJECT_PATH)/keymaps/$(KEYMAP)/keymap.c)","")
 $(error "$(KEYMAP_PATH)/keymap.c" does not exist)
+       else
+               KEYMAP_PATH = $(SUBPROJECT_PATH)/keymaps/$(KEYMAP)
+               KEYMAP_FILE = keyboards/$(KEYBOARD)/$(SUBPROJECT)/keymaps/$(KEYMAP)/keymap.c
+               -include $(KEYMAP_PATH)/Makefile
+       endif
 endif
 
 ifdef SUBPROJECT