X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;ds=sidebyside;f=common.mk;h=9bf34f2b8e4b2560fe966c1863c10097bc870b16;hb=a112f3614e0e3204ce35dcdfbf2723c3382c4c35;hp=17c6816f6c94bfa5b489e2b0106ef5005a7de4c6;hpb=e67c988824f5ec0c965beb412f8ee5953dfd3c8c;p=max%2Ftmk_keyboard.git

diff --git a/common.mk b/common.mk
index 17c6816f..9bf34f2b 100644
--- a/common.mk
+++ b/common.mk
@@ -1,21 +1,23 @@
-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)/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
+    SRC += $(COMMON_DIR)/ps2.c \
+           $(COMMON_DIR)/ps2_mouse.c
     OPT_DEFS += -DPS2_MOUSE_ENABLE
 endif
 
@@ -32,7 +34,4 @@ ifdef $(or MOUSEKEY_ENABLE, PS2_MOUSE_ENABLE)
 endif
 
 # Search Path
-VPATH += $(COMMON_DIR)
-
-
-include $(COMMON_DIR)/rules.mk
+VPATH += $(TOP_DIR)/common