Fix Makefiles.

diff --git a/converter/adb_usb/Makefile b/converter/adb_usb/Makefile
index 248261df0b4e480cb54c9b504ddaf79ecd5a8ac7..e9a90695b106860fe674aa125bedcbc85e47cdbf 100644 (file)
--- a/converter/adb_usb/Makefile
+++ b/converter/adb_usb/Makefile
@@ -8,8 +8,7 @@ TOP_DIR = ../..
 TARGET_DIR = .
 
 # keyboard dependent files
-SRC =  main.c \
-       keymap.c \
+SRC =  keymap.c \
        matrix.c \
        led.c \
        adb.c
@@ -42,16 +41,11 @@ EXTRAKEY_ENABLE = yes       # Audio control and System control
 #NKRO_ENABLE = yes     # USB Nkey Rollover
 
 
-
-#---------------- Programming Options --------------------------
-PROGRAM_CMD = teensy_loader_cli -mmcu=$(MCU) -w -v $(TARGET).hex
-
-
+# Search Path
+VPATH += $(TARGET_DIR)
+VPATH += $(TOP_DIR)
 
 include $(TOP_DIR)/protocol/pjrc.mk
 include $(TOP_DIR)/protocol.mk
 include $(TOP_DIR)/common.mk
 include $(TOP_DIR)/rules.mk
-
-dfu: PROGRAM_CMD = dfu-programmer atmega32u4 flash $(TARGET).hex
-dfu: program

diff --git a/converter/m0110_usb/Makefile b/converter/m0110_usb/Makefile
index 4a687b93334e378c951e2eb3c001bf0d5de3027f..1fee258a6fbc12eb02e0b81520e9784728d6b6ff 100644 (file)
--- a/converter/m0110_usb/Makefile
+++ b/converter/m0110_usb/Makefile
@@ -8,8 +8,7 @@ TOP_DIR = ../..
 TARGET_DIR = .
 
 # keyboard dependent files
-SRC =  main.c \
-       keymap.c \
+SRC =  keymap.c \
        matrix.c \
        led.c \
        m0110.c
@@ -47,6 +46,10 @@ EXTRAKEY_ENABLE = yes        # Audio control and System control
 PROGRAM_CMD = teensy_loader_cli -mmcu=$(MCU) -w -v $(TARGET).hex
 
 
+# Search Path
+VPATH += $(TARGET_DIR)
+VPATH += $(TOP_DIR)
+
 
 include $(TOP_DIR)/protocol/pjrc.mk
 include $(TOP_DIR)/protocol.mk

diff --git a/converter/news_usb/Makefile.pjrc b/converter/news_usb/Makefile.pjrc
index 376133ad5e32d7756c3dff3ca763f3715338b1f7..3233463d58422e74e5c19464ae79b55840639a51 100644 (file)
--- a/converter/news_usb/Makefile.pjrc
+++ b/converter/news_usb/Makefile.pjrc
@@ -13,8 +13,7 @@ TOP_DIR = ../..
 TARGET_DIR = .
 
 # keyboard dependent files
-SRC =  main.c \
-       keymap.c \
+SRC =  keymap.c \
        matrix.c \
        led.c \
        news.c
@@ -51,6 +50,10 @@ NKRO_ENABLE = yes    # USB Nkey Rollover
 PROGRAM_CMD = teensy_loader_cli -mmcu=$(MCU) -w -v $(TARGET).hex
 
 
+# Search Path
+VPATH += $(TARGET_DIR)
+VPATH += $(TOP_DIR)
+
 
 include $(TOP_DIR)/protocol/pjrc.mk
 include $(TOP_DIR)/protocol.mk

diff --git a/converter/ps2_usb/Makefile b/converter/ps2_usb/Makefile
index 0bba191a38256fb417554430dc768d8be339b286..1278a74be700e56eb416f04f6be62f6749cf2891 100644 (file)
--- a/converter/ps2_usb/Makefile
+++ b/converter/ps2_usb/Makefile
@@ -13,8 +13,7 @@ TOP_DIR = ../..
 TARGET_DIR = .
 
 # keyboard dependent files
-SRC =  main.c \
-       keymap.c \
+SRC =  keymap.c \
        matrix.c \
        led.c \
        ps2.c
@@ -51,6 +50,10 @@ NKRO_ENABLE = yes    # USB Nkey Rollover
 PROGRAM_CMD = teensy_loader_cli -mmcu=$(MCU) -w -v $(TARGET).hex
 
 
+# Search Path
+VPATH += $(TARGET_DIR)
+VPATH += $(TOP_DIR)
+
 
 include $(TOP_DIR)/protocol/pjrc.mk
 include $(TOP_DIR)/protocol.mk

diff --git a/converter/ps2_usb/Makefile.pjrc_usart b/converter/ps2_usb/Makefile.pjrc_usart
index 3dad7e2f8cc25d15de9d6a165c182ca37ce063bc..dd74712e4804bfeaf66ef4f20b7b8255db04b294 100644 (file)
--- a/converter/ps2_usb/Makefile.pjrc_usart
+++ b/converter/ps2_usb/Makefile.pjrc_usart
@@ -13,8 +13,7 @@ TOP_DIR = ../..
 TARGET_DIR = .
 
 # keyboard dependent files
-SRC =  main.c \
-       keymap.c \
+SRC =   keymap.c \
        matrix.c \
        led.c \
        ps2_usart.c
@@ -51,6 +50,10 @@ NKRO_ENABLE = yes    # USB Nkey Rollover
 PROGRAM_CMD = teensy_loader_cli -mmcu=$(MCU) -w -v $(TARGET).hex
 
 
+# Search Path
+VPATH += $(TARGET_DIR)
+VPATH += $(TOP_DIR)
+
 
 include $(TOP_DIR)/protocol/pjrc.mk
 include $(TOP_DIR)/protocol.mk

diff --git a/converter/ps2_usb/Makefile.vusb b/converter/ps2_usb/Makefile.vusb
index 4d5240c30948f44b20484d3b126945b1b85b0994..b08d30d574adfcdd965666719a32c3cb3bd56b77 100644 (file)
--- a/converter/ps2_usb/Makefile.vusb
+++ b/converter/ps2_usb/Makefile.vusb
@@ -13,8 +13,7 @@ TOP_DIR = ../..
 TARGET_DIR = .
 
 # keyboard dependent files
-SRC =  main.c \
-       keymap.c \
+SRC =  keymap.c \
        matrix.c \
        led.c \
        ps2_usart.c
@@ -85,6 +84,18 @@ AVRDUDE_FLAGS += $(AVRDUDE_ERASE_COUNTER)
 PROGRAM_CMD = $(AVRDUDE) $(AVRDUDE_FLAGS) $(AVRDUDE_WRITE_FLASH) $(AVRDUDE_WRITE_EEPROM)
 
 
+# Boot Section Size in bytes
+#   Teensy halfKay   512
+#   Atmel DFU loader 4096
+#   LUFA bootloader  4096
+#   USBasp           2048
+OPT_DEFS += -DBOOT_SIZE=2048
+
+
+# Search Path
+VPATH += $(TARGET_DIR)
+VPATH += $(TOP_DIR)
+
 
 include $(TOP_DIR)/protocol/vusb.mk
 include $(TOP_DIR)/protocol.mk

diff --git a/converter/terminal_usb/Makefile.102_pjrc b/converter/terminal_usb/Makefile.102_pjrc
index e9d14e7a05b243fb6b6b4922b49fcc96a0fa9c5f..e2d1a00a5bbb2727679a51dd24e13753370328dd 100644 (file)
--- a/converter/terminal_usb/Makefile.102_pjrc
+++ b/converter/terminal_usb/Makefile.102_pjrc
@@ -13,8 +13,7 @@ TOP_DIR = ../..
 TARGET_DIR = .
 
 # keyboard dependent files
-SRC =  main.c \
-       keymap_102.c \
+SRC =  keymap_102.c \
        matrix.c \
        led.c \
        ps2.c
@@ -51,6 +50,10 @@ NKRO_ENABLE = yes    # USB Nkey Rollover
 PROGRAM_CMD = teensy_loader_cli -mmcu=$(MCU) -w -v $(TARGET).hex
 
 
+# Search Path
+VPATH += $(TARGET_DIR)
+VPATH += $(TOP_DIR)
+
 
 include $(TOP_DIR)/protocol/pjrc.mk
 include $(TOP_DIR)/protocol.mk

diff --git a/converter/terminal_usb/Makefile.122_pjrc b/converter/terminal_usb/Makefile.122_pjrc
index bec00510e58ccf220c4485cf2fdd0a67b0d7daf4..ee42dd7436ce6d37255b48ed5798967b4119c5c5 100644 (file)
--- a/converter/terminal_usb/Makefile.122_pjrc
+++ b/converter/terminal_usb/Makefile.122_pjrc
@@ -13,8 +13,7 @@ TOP_DIR = ../..
 TARGET_DIR = .
 
 # keyboard dependent files
-SRC =  main.c \
-       keymap_122.c \
+SRC =  keymap_122.c \
        matrix.c \
        led.c \
        ps2.c
@@ -51,6 +50,10 @@ F_CPU = 16000000
 PROGRAM_CMD = teensy_loader_cli -mmcu=$(MCU) -w -v $(TARGET).hex
 
 
+# Search Path
+VPATH += $(TARGET_DIR)
+VPATH += $(TOP_DIR)
+
 
 include $(TOP_DIR)/protocol/pjrc.mk
 include $(TOP_DIR)/protocol.mk

diff --git a/converter/x68k_usb/Makefile b/converter/x68k_usb/Makefile
index c3b5fa29f322c9f5526989cbcc6d122c8e328e5b..62b976c56f639812144866c7bea4a5745c60fdd4 100644 (file)
--- a/converter/x68k_usb/Makefile
+++ b/converter/x68k_usb/Makefile
@@ -13,8 +13,7 @@ TOP_DIR = ../..
 TARGET_DIR = .
 
 # keyboard dependent files
-SRC =  main.c \
-       keymap.c \
+SRC =  keymap.c \
        matrix.c \
        led.c \
        x68k.c
@@ -80,6 +79,10 @@ AVRDUDE_FLAGS += $(AVRDUDE_ERASE_COUNTER)
 PROGRAM_CMD = dfu-programmer atmega32u4 flash $(TARGET).hex
 
 
+# Search Path
+VPATH += $(TARGET_DIR)
+VPATH += $(TOP_DIR)
+
 
 include $(TOP_DIR)/protocol/pjrc.mk
 include $(TOP_DIR)/protocol.mk