From ba6fb23f079a03f978c81deda58d1d18e08c54dc Mon Sep 17 00:00:00 2001
From: Jack Humbert <jack.humb@gmail.com>
Date: Wed, 29 Jun 2016 20:21:05 -0400
Subject: adds handwire and onekey example

---
 Makefile | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 5642aa283..f9b865b9f 100644
--- 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
-- 
cgit v1.2.3-24-g4f1b