X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=common.mk;h=04f036477115de2a1410d5e7fb517ec3f2d2ed2c;hb=fa545c87f74833856761572ef631d20accc1d026;hp=ee28b696cbc278c88db366f0e8bae859ef2c6716;hpb=58ca7b904b4410416f6b7edf1051ec58f6cdb6c4;p=tmk_firmware.git

diff --git a/common.mk b/common.mk
index ee28b69..04f0364 100644
--- a/common.mk
+++ b/common.mk
@@ -3,28 +3,29 @@ SRC +=	$(COMMON_DIR)/host.c \
 	$(COMMON_DIR)/keyboard.c \
 	$(COMMON_DIR)/action.c \
 	$(COMMON_DIR)/action_tapping.c \
-	$(COMMON_DIR)/action_oneshot.c \
 	$(COMMON_DIR)/action_macro.c \
 	$(COMMON_DIR)/action_layer.c \
+	$(COMMON_DIR)/action_util.c \
 	$(COMMON_DIR)/keymap.c \
-	$(COMMON_DIR)/timer.c \
 	$(COMMON_DIR)/print.c \
-	$(COMMON_DIR)/bootloader.c \
-	$(COMMON_DIR)/suspend.c \
-	$(COMMON_DIR)/xprintf.S \
-	$(COMMON_DIR)/util.c
+	$(COMMON_DIR)/util.c \
+	$(COMMON_DIR)/avr/suspend.c \
+	$(COMMON_DIR)/avr/xprintf.S \
+	$(COMMON_DIR)/avr/timer.c \
+	$(COMMON_DIR)/avr/bootloader.c
 
 
 # Option modules
 ifdef BOOTMAGIC_ENABLE
     SRC += $(COMMON_DIR)/bootmagic.c
-    SRC += $(COMMON_DIR)/eeconfig.c
+    SRC += $(COMMON_DIR)/avr/eeconfig.c
     OPT_DEFS += -DBOOTMAGIC_ENABLE
 endif
 
 ifdef MOUSEKEY_ENABLE
     SRC += $(COMMON_DIR)/mousekey.c
     OPT_DEFS += -DMOUSEKEY_ENABLE
+    OPT_DEFS += -DMOUSE_ENABLE
 endif
 
 ifdef EXTRAKEY_ENABLE
@@ -47,14 +48,8 @@ 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
+ifdef USB_6KRO_ENABLE
+    OPT_DEFS += -DUSB_6KRO_ENABLE
 endif
 
 ifdef SLEEP_LED_ENABLE
@@ -74,7 +69,7 @@ ifdef KEYMAP_SECTION_ENABLE
 endif
 
 # Version string
-OPT_DEFS += -DVERSION=$(shell (git describe --dirty || echo 'unknown') 2> /dev/null)
+OPT_DEFS += -DVERSION=$(shell (git describe --always --dirty || echo 'unknown') 2> /dev/null)
 
 
 # Search Path