X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=common.mk;h=62ac0ff787e9dba800cb8a0375b9bc69001de43e;hb=c672cbc31c67335050dc3ba9d54acb97e5d3da0c;hp=2ce4e32da50a48d6e5bab4ddc88a384e67905841;hpb=9a106537f64fe61af6048b41262f002ce6a716d9;p=tmk_firmware.git

diff --git a/common.mk b/common.mk
index 2ce4e32..62ac0ff 100644
--- a/common.mk
+++ b/common.mk
@@ -2,14 +2,16 @@ COMMON_DIR = common
 SRC +=	$(COMMON_DIR)/host.c \
 	$(COMMON_DIR)/keyboard.c \
 	$(COMMON_DIR)/action.c \
+	$(COMMON_DIR)/action_tapping.c \
 	$(COMMON_DIR)/action_macro.c \
-	$(COMMON_DIR)/layer_switch.c \
+	$(COMMON_DIR)/action_layer.c \
+	$(COMMON_DIR)/action_util.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)/suspend.c \
+	$(COMMON_DIR)/xprintf.S \
 	$(COMMON_DIR)/util.c
 
 
@@ -23,6 +25,7 @@ endif
 ifdef MOUSEKEY_ENABLE
     SRC += $(COMMON_DIR)/mousekey.c
     OPT_DEFS += -DMOUSEKEY_ENABLE
+    OPT_DEFS += -DMOUSE_ENABLE
 endif
 
 ifdef EXTRAKEY_ENABLE
@@ -36,25 +39,38 @@ else
     OPT_DEFS += -DNO_DEBUG
 endif
 
-ifdef NKRO_ENABLE
-    OPT_DEFS += -DNKRO_ENABLE
+ifdef COMMAND_ENABLE
+    SRC += $(COMMON_DIR)/command.c
+    OPT_DEFS += -DCOMMAND_ENABLE
 endif
 
-ifdef PS2_MOUSE_ENABLE
-    SRC += $(COMMON_DIR)/ps2.c \
-           $(COMMON_DIR)/ps2_mouse.c
-    OPT_DEFS += -DPS2_MOUSE_ENABLE
+ifdef NKRO_ENABLE
+    OPT_DEFS += -DNKRO_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
     SRC += $(COMMON_DIR)/sleep_led.c
     OPT_DEFS += -DSLEEP_LED_ENABLE
+    OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
 endif
 
+ifdef BACKLIGHT_ENABLE
+    SRC += $(COMMON_DIR)/backlight.c
+    OPT_DEFS += -DBACKLIGHT_ENABLE
+endif
+
+ifdef KEYMAP_SECTION_ENABLE
+    OPT_DEFS += -DKEYMAP_SECTION_ENABLE
+    EXTRALDFLAGS = -Wl,-L$(TOP_DIR),-Tldscript_keymap_avr5.x
+endif
+
+# Version string
+OPT_DEFS += -DVERSION=$(shell (git describe --always --dirty || echo 'unknown') 2> /dev/null)
+
 
 # Search Path
 VPATH += $(TOP_DIR)/common