1 files changed, 63 insertions, 5 deletions

diff --git a/Makefile b/Makefile
index ffbdf742c..72710c2d9 100644
--- a/Makefile
+++ b/Makefile
@@ -10,19 +10,32 @@ abs_tmk_root := $(patsubst %/,%,$(dir $(mkfile_path)))
 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)))
-                tmk_root = ../../../..
+                KEYBOARD_DIR:=$(firstword $(subst /keymaps/, ,$(possible_keyboard)))
+                ifneq (,$(findstring /,$(KEYBOARD_DIR)))
+                        # SUBPROJECT_DIR:=$(lastword $(subst /, ,$(KEYBOARD_DIR)))
+                        # KEYBOARD_DIR:=$(firstword $(subst /, ,$(KEYBOARD_DIR)))
+                        tmk_root = ../../..
+                else
+                        tmk_root = ../../../..
+                endif
         else
-                KEYBOARD_DIR:=$(possible_keyboard)
                 KEYMAP_DIR:=default
-                tmk_root = ../..
+                KEYBOARD_DIR:=$(possible_keyboard)
+                ifneq (,$(findstring /,$(KEYBOARD_DIR)))
+                        # SUBPROJECT_DIR:=$(lastword $(subst /, ,$(KEYBOARD_DIR)))
+                        # KEYBOARD_DIR:=$(firstword $(subst /, ,$(KEYBOARD_DIR)))
+                        tmk_root = ../../..
+                else
+                        tmk_root = ../..
+                endif
         endif
 else
         tmk_root = .
 endif
 # $(info $(KEYBOARD_DIR))
 # $(info $(KEYMAP_DIR))
+# $(info $(SUBPROJECT_DIR))
 
 # Directory common source filess exist
 TOP_DIR = $(tmk_root)
@@ -32,6 +45,7 @@ TMK_PATH = $(TOP_DIR)/$(TMK_DIR)
 QUANTUM_DIR = quantum
 QUANTUM_PATH = $(TOP_DIR)/$(QUANTUM_DIR)
 
+
 ifdef keyboard
         KEYBOARD ?= $(keyboard)
 endif
@@ -41,7 +55,16 @@ endif
 ifndef KEYBOARD
         KEYBOARD=planck
 endif
+
+# converts things to keyboards/subproject
+ifneq (,$(findstring /,$(KEYBOARD)))
+        TEMP:=$(KEYBOARD)
+        KEYBOARD:=$(firstword $(subst /, ,$(TEMP)))
+        SUBPROJECT:=$(lastword $(subst /, ,$(TEMP)))
+endif
+
 KEYBOARD_PATH = $(TOP_DIR)/keyboards/$(KEYBOARD)
+
 ifneq ("$(wildcard $(KEYBOARD_PATH)/$(KEYBOARD).c)","")
         KEYBOARD_FILE = keyboards/$(KEYBOARD)/$(KEYBOARD).c
         ifndef ARCH
@@ -51,6 +74,28 @@ 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
+
+ifdef SUBPROJECT
+        SUBPROJECT_PATH = $(TOP_DIR)/keyboards/$(KEYBOARD)/$(SUBPROJECT)
+        ifneq ("$(wildcard $(SUBPROJECT_PATH)/$(SUBPROJECT).c)","")
+                OPT_DEFS += -DSUBPROJECT_$(SUBPROJECT)
+                SUBPROJECT_FILE = keyboards/$(KEYBOARD)/$(SUBPROJECT)/$(SUBPROJECT).c
+                -include $(SUBPROJECT_PATH)/Makefile
+        else 
+$(error "$(SUBPROJECT_PATH)/$(SUBPROJECT).c" does not exist)
+        endif
+endif
+
 ifdef keymap
         KEYMAP ?= $(keymap)
 endif
@@ -68,7 +113,13 @@ else
 $(error "$(KEYMAP_PATH)/keymap.c" does not exist)
 endif
 
-TARGET ?= $(KEYBOARD)_$(KEYMAP)
+ifdef SUBPROJECT
+        TARGET ?= $(KEYBOARD)_$(SUBPROJECT)_$(KEYMAP)
+else
+        TARGET ?= $(KEYBOARD)_$(KEYMAP)
+endif
+
+
 
 ifneq ("$(wildcard $(KEYMAP_PATH)/config.h)","")
         CONFIG_H = $(KEYMAP_PATH)/config.h
@@ -83,6 +134,10 @@ SRC += $(KEYBOARD_FILE) \
         $(QUANTUM_DIR)/keymap.c \
         $(QUANTUM_DIR)/keycode_config.c
 
+ifdef SUBPROJECT
+        SRC += $(SUBPROJECT_FILE)
+endif
+
 ifndef CUSTOM_MATRIX
         SRC += $(QUANTUM_DIR)/matrix.c
 endif
@@ -104,6 +159,9 @@ endif
 
 # Search Path
 VPATH += $(KEYMAP_PATH)
+ifdef SUBPROJECT
+        VPATH += $(SUBPROJECT_PATH)
+endif
 VPATH += $(KEYBOARD_PATH)
 VPATH += $(TOP_DIR)
 VPATH += $(TMK_PATH)