Merge commit '71381457fa1311dfa0b58ba882a96db740640871'

[max/tmk_keyboard.git] / keyboard / alps64 / Makefile

diff --git a/keyboard/alps64/Makefile b/keyboard/alps64/Makefile
index a7d59309e828748f7dd3d7c9a66adf35cbd01931..c82c126be097fb5765808c5ac4c9a08c59f8e0ec 100644 (file)
--- a/keyboard/alps64/Makefile
+++ b/keyboard/alps64/Makefile
@@ -42,22 +42,15 @@
 TARGET = alps64
 
 # Directory common source filess exist
-TOP_DIR = ../..
+TMK_DIR = ../../tmk_core
 
 # Directory keyboard dependent files exist
 TARGET_DIR = .
 
 # project specific files
-SRC =  keymap_common.c \
-       matrix.c \
+SRC =  matrix.c \
        led.c
 
-ifdef KEYMAP
-    SRC := keymap_$(KEYMAP).c $(SRC)
-else
-    SRC := keymap_plain.c $(SRC)
-endif
-
 CONFIG_H = config.h
 
 
@@ -120,6 +113,20 @@ CONSOLE_ENABLE = yes       # Console for debug(+400)
 COMMAND_ENABLE = yes    # Commands for debug and configuration
 #SLEEP_LED_ENABLE = yes  # Breathing sleep LED during USB suspend
 #NKRO_ENABLE = yes     # USB Nkey Rollover - not yet supported in LUFA
+#ACTIONMAP_ENABLE = yes        # Use 16bit action codes in keymap instead of 8bit keycodes
+
+
+ifdef ACTIONMAP_ENABLE
+    KEYMAP_FILE = actionmap
+else
+    KEYMAP_FILE = keymap
+    SRC := keymap_common.c $(SRC)
+endif
+ifdef KEYMAP
+    SRC := $(KEYMAP_FILE)_$(KEYMAP).c $(SRC)
+else
+    SRC := $(KEYMAP_FILE)_plain.c $(SRC)
+endif
 
 
 # Optimize size but this may cause error "relocation truncated to fit"
@@ -127,8 +134,8 @@ COMMAND_ENABLE = yes    # Commands for debug and configuration
 
 # Search Path
 VPATH += $(TARGET_DIR)
-VPATH += $(TOP_DIR)
+VPATH += $(TMK_DIR)
 
-include $(TOP_DIR)/protocol/lufa.mk
-include $(TOP_DIR)/common.mk
-include $(TOP_DIR)/rules.mk
+include $(TMK_DIR)/protocol/lufa.mk
+include $(TMK_DIR)/common.mk
+include $(TMK_DIR)/rules.mk