X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=tmk_core%2Fcommon.mk;h=9cfe6d5a9e275e48b2748f462262f641db6cdb39;hb=163c66d019a8fd22e437394f4ee1450f70245b93;hp=159183a267d5b2207826d640944ce83748922f00;hpb=aa44c779ecec4ca569b2fa11ed41413515f62755;p=max%2Ftmk_keyboard.git

diff --git a/tmk_core/common.mk b/tmk_core/common.mk
index 159183a2..9cfe6d5a 100644
--- a/tmk_core/common.mk
+++ b/tmk_core/common.mk
@@ -1,4 +1,4 @@
-COMMON_DIR = $(TMK_DIR)/common
+COMMON_DIR = common
 SRC +=	$(COMMON_DIR)/host.c \
 	$(COMMON_DIR)/keyboard.c \
 	$(COMMON_DIR)/action.c \
@@ -6,10 +6,10 @@ SRC +=	$(COMMON_DIR)/host.c \
 	$(COMMON_DIR)/action_macro.c \
 	$(COMMON_DIR)/action_layer.c \
 	$(COMMON_DIR)/action_util.c \
-	$(COMMON_DIR)/keymap.c \
 	$(COMMON_DIR)/print.c \
 	$(COMMON_DIR)/debug.c \
 	$(COMMON_DIR)/util.c \
+	$(COMMON_DIR)/hook.c \
 	$(COMMON_DIR)/avr/suspend.c \
 	$(COMMON_DIR)/avr/xprintf.S \
 	$(COMMON_DIR)/avr/timer.c \
@@ -17,6 +17,13 @@ SRC +=	$(COMMON_DIR)/host.c \
 
 
 # Option modules
+ifdef ACTIONMAP_ENABLE
+    SRC += $(COMMON_DIR)/actionmap.c
+    OPT_DEFS += -DACTIONMAP_ENABLE
+else
+    SRC += $(COMMON_DIR)/keymap.c
+endif
+
 ifdef BOOTMAGIC_ENABLE
     SRC += $(COMMON_DIR)/bootmagic.c
     SRC += $(COMMON_DIR)/avr/eeconfig.c
@@ -53,6 +60,10 @@ ifdef USB_6KRO_ENABLE
     OPT_DEFS += -DUSB_6KRO_ENABLE
 endif
 
+ifdef KEYBOARD_LOCK_ENABLE
+    OPT_DEFS += -DKEYBOARD_LOCK_ENABLE
+endif
+
 ifdef SLEEP_LED_ENABLE
     SRC += $(COMMON_DIR)/avr/sleep_led.c
     OPT_DEFS += -DSLEEP_LED_ENABLE
@@ -77,7 +88,8 @@ ifdef KEYMAP_SECTION_ENABLE
 endif
 
 # Version string
-OPT_DEFS += -DVERSION=$(shell (git describe --always --dirty || echo 'unknown') 2> /dev/null)
+VERSION := $(shell (git describe --always --dirty || echo 'unknown') 2> /dev/null)
+OPT_DEFS += -DVERSION=$(VERSION)
 
 
 # Search Path