Merge pull request #8 from JeffreySung/master

[tmk_firmware.git] / common.mk

diff --git a/common.mk b/common.mk
index 17c6816f6c94bfa5b489e2b0106ef5005a7de4c6..26b4bb85962317777df8ee99b23aaa375667e344 100644 (file)
--- a/common.mk
+++ b/common.mk
@@ -1,38 +1,42 @@
-SRC += host.c \
-       keyboard.c \
-       command.c \
-       layer.c \
-       timer.c \
-       print.c \
-       util.c
+COMMON_DIR = common
+SRC += $(COMMON_DIR)/host.c \
+       $(COMMON_DIR)/keyboard.c \
+       $(COMMON_DIR)/command.c \
+       $(COMMON_DIR)/layer.c \
+       $(COMMON_DIR)/timer.c \
+       $(COMMON_DIR)/print.c \
+       $(COMMON_DIR)/debug.c \
+       $(COMMON_DIR)/bootloader.c \
+       $(COMMON_DIR)/util.c
 
 
 # Option modules
 ifdef MOUSEKEY_ENABLE
-    SRC += mousekey.c
+    SRC += $(COMMON_DIR)/mousekey.c
     OPT_DEFS += -DMOUSEKEY_ENABLE
 endif
 
-ifdef PS2_MOUSE_ENABLE
-    SRC += ps2.c \
-          ps2_mouse.c
-    OPT_DEFS += -DPS2_MOUSE_ENABLE
-endif
-
 ifdef EXTRAKEY_ENABLE
     OPT_DEFS += -DEXTRAKEY_ENABLE
 endif
 
+ifdef CONSOLE_ENABLE
+    OPT_DEFS += -DCONSOLE_ENABLE
+endif
+
 ifdef NKRO_ENABLE
     OPT_DEFS += -DNKRO_ENABLE
 endif
 
+ifdef PS2_MOUSE_ENABLE
+    SRC += $(COMMON_DIR)/ps2.c \
+           $(COMMON_DIR)/ps2_mouse.c
+    OPT_DEFS += -DPS2_MOUSE_ENABLE
+endif
+
 ifdef $(or MOUSEKEY_ENABLE, PS2_MOUSE_ENABLE)
     OPT_DEFS += -DMOUSE_ENABLE
 endif
 
 # Search Path
-VPATH += $(COMMON_DIR)
-
-
-include $(COMMON_DIR)/rules.mk
+VPATH += $(TOP_DIR)/common