Merge remote-tracking branch 'tmk/master' into cub_layout

[max/tmk_keyboard.git] / converter / ps2_usb / Makefile.vusb

diff --git a/converter/ps2_usb/Makefile.vusb b/converter/ps2_usb/Makefile.vusb
index d449e1e40f3eb0cf548f759cb9b4345a0b74d2c0..ddf186845949d997322028b3c4423314914c0f44 100644 (file)
--- a/converter/ps2_usb/Makefile.vusb
+++ b/converter/ps2_usb/Makefile.vusb
@@ -8,10 +8,16 @@ TOP_DIR = ../..
 TARGET_DIR = .
 
 # keyboard dependent files
-SRC =  keymap.c \
+SRC = keymap_common.c \
        matrix.c \
        led.c
 
+ifdef KEYMAP
+    SRC := keymap_$(KEYMAP).c $(SRC)
+else
+    SRC := keymap_plain.c $(SRC)
+endif
+
 # Use USART for PS/2. With V-USB INT and BUSYWAIT code is not useful.
 SRC += protocol/ps2_usart.c
 OPT_DEFS += -DPS2_USE_USART
@@ -87,7 +93,7 @@ PROGRAM_CMD = $(AVRDUDE) $(AVRDUDE_FLAGS) $(AVRDUDE_WRITE_FLASH) $(AVRDUDE_WRITE
 #   Atmel DFU loader 4096
 #   LUFA bootloader  4096
 #   USBasp           2048
-OPT_DEFS += -DBOOT_SIZE=2048
+OPT_DEFS += -DBOOTLOADER_SIZE=2048
 
 
 # Search Path
@@ -95,7 +101,7 @@ VPATH += $(TARGET_DIR)
 VPATH += $(TOP_DIR)
 
 
-include $(TOP_DIR)/protocol/vusb.mk
 include $(TOP_DIR)/protocol.mk
 include $(TOP_DIR)/common.mk
+include $(TOP_DIR)/protocol/vusb.mk
 include $(TOP_DIR)/rules.mk