Merge branch 'ibm4704_ext'

[max/tmk_keyboard.git] / converter / adb_usb / Makefile

diff --git a/converter/adb_usb/Makefile b/converter/adb_usb/Makefile
index 21141674245d4f2356a7185f1f18cd90811c0ed3..a16873dc03c8df1a255d741a62bd1fbd30eff230 100644 (file)
--- a/converter/adb_usb/Makefile
+++ b/converter/adb_usb/Makefile
@@ -42,17 +42,23 @@
 TARGET = adb_usb_lufa
 
 # Directory common source filess exist
-TOP_DIR = ../..
+TMK_DIR = ../../tmk_core
 
 # Directory keyboard dependent files exist
 TARGET_DIR = .
 
 # project specific files
-SRC =  keymap.c \
+SRC =  keymap_common.c \
        matrix.c \
        led.c \
        adb.c
 
+ifdef KEYMAP
+    SRC := keymap_$(KEYMAP).c $(SRC)
+else
+    SRC := keymap_ansi.c $(SRC)
+endif
+
 CONFIG_H = config.h
 
 
@@ -115,7 +121,7 @@ EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
 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
+#NKRO_ENABLE = yes     # USB Nkey Rollover
 
 
 # Optimize size but this may cause error "relocation truncated to fit"
@@ -123,9 +129,9 @@ 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)/protocol.mk
-include $(TOP_DIR)/common.mk
-include $(TOP_DIR)/rules.mk
+include $(TMK_DIR)/protocol/lufa.mk
+include $(TMK_DIR)/protocol.mk
+include $(TMK_DIR)/common.mk
+include $(TMK_DIR)/rules.mk