X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=common.mk;h=5fb76e739b03f5e1ebf1c0bf30c19f574523ecbe;hb=0368936060fbc32395508b09c76b620828d36db1;hp=03cbc296d8207732c1b0418b8fa754bf8c66c402;hpb=e65575d4a5f03a90adfa9850cb71a5d0448098cd;p=max%2Ftmk_keyboard.git

diff --git a/common.mk b/common.mk
index 03cbc296..5fb76e73 100644
--- a/common.mk
+++ b/common.mk
@@ -1,39 +1,45 @@
-SRC +=	host.c \
-	keyboard.c \
-	command.c \
-	layer.c \
-	timer.c \
-	print.c \
-	bootloader.c \
-	util.c
+COMMON_DIR = common
+SRC +=	$(COMMON_DIR)/host.c \
+	$(COMMON_DIR)/keyboard.c \
+	$(COMMON_DIR)/action.c \
+	$(COMMON_DIR)/action_macro.c \
+	$(COMMON_DIR)/layer_switch.c \
+	$(COMMON_DIR)/keymap.c \
+	$(COMMON_DIR)/command.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