1
0
Fork 0

Fix Makefiles.

This commit is contained in:
tmk 2012-06-30 14:44:59 +09:00
parent 6d79e6579f
commit 2769f09d11
9 changed files with 52 additions and 26 deletions

View file

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

View file

@ -8,8 +8,7 @@ TOP_DIR = ../..
TARGET_DIR = . TARGET_DIR = .
# keyboard dependent files # keyboard dependent files
SRC = main.c \ SRC = keymap.c \
keymap.c \
matrix.c \ matrix.c \
led.c \ led.c \
m0110.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 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/pjrc.mk
include $(TOP_DIR)/protocol.mk include $(TOP_DIR)/protocol.mk

View file

@ -13,8 +13,7 @@ TOP_DIR = ../..
TARGET_DIR = . TARGET_DIR = .
# keyboard dependent files # keyboard dependent files
SRC = main.c \ SRC = keymap.c \
keymap.c \
matrix.c \ matrix.c \
led.c \ led.c \
news.c news.c
@ -51,6 +50,10 @@ NKRO_ENABLE = yes # USB Nkey Rollover
PROGRAM_CMD = teensy_loader_cli -mmcu=$(MCU) -w -v $(TARGET).hex 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/pjrc.mk
include $(TOP_DIR)/protocol.mk include $(TOP_DIR)/protocol.mk

View file

@ -13,8 +13,7 @@ TOP_DIR = ../..
TARGET_DIR = . TARGET_DIR = .
# keyboard dependent files # keyboard dependent files
SRC = main.c \ SRC = keymap.c \
keymap.c \
matrix.c \ matrix.c \
led.c \ led.c \
ps2.c ps2.c
@ -51,6 +50,10 @@ NKRO_ENABLE = yes # USB Nkey Rollover
PROGRAM_CMD = teensy_loader_cli -mmcu=$(MCU) -w -v $(TARGET).hex 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/pjrc.mk
include $(TOP_DIR)/protocol.mk include $(TOP_DIR)/protocol.mk

View file

@ -13,8 +13,7 @@ TOP_DIR = ../..
TARGET_DIR = . TARGET_DIR = .
# keyboard dependent files # keyboard dependent files
SRC = main.c \ SRC = keymap.c \
keymap.c \
matrix.c \ matrix.c \
led.c \ led.c \
ps2_usart.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 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/pjrc.mk
include $(TOP_DIR)/protocol.mk include $(TOP_DIR)/protocol.mk

View file

@ -13,8 +13,7 @@ TOP_DIR = ../..
TARGET_DIR = . TARGET_DIR = .
# keyboard dependent files # keyboard dependent files
SRC = main.c \ SRC = keymap.c \
keymap.c \
matrix.c \ matrix.c \
led.c \ led.c \
ps2_usart.c ps2_usart.c
@ -85,6 +84,18 @@ AVRDUDE_FLAGS += $(AVRDUDE_ERASE_COUNTER)
PROGRAM_CMD = $(AVRDUDE) $(AVRDUDE_FLAGS) $(AVRDUDE_WRITE_FLASH) $(AVRDUDE_WRITE_EEPROM) 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/vusb.mk
include $(TOP_DIR)/protocol.mk include $(TOP_DIR)/protocol.mk

View file

@ -13,8 +13,7 @@ TOP_DIR = ../..
TARGET_DIR = . TARGET_DIR = .
# keyboard dependent files # keyboard dependent files
SRC = main.c \ SRC = keymap_102.c \
keymap_102.c \
matrix.c \ matrix.c \
led.c \ led.c \
ps2.c ps2.c
@ -51,6 +50,10 @@ NKRO_ENABLE = yes # USB Nkey Rollover
PROGRAM_CMD = teensy_loader_cli -mmcu=$(MCU) -w -v $(TARGET).hex 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/pjrc.mk
include $(TOP_DIR)/protocol.mk include $(TOP_DIR)/protocol.mk

View file

@ -13,8 +13,7 @@ TOP_DIR = ../..
TARGET_DIR = . TARGET_DIR = .
# keyboard dependent files # keyboard dependent files
SRC = main.c \ SRC = keymap_122.c \
keymap_122.c \
matrix.c \ matrix.c \
led.c \ led.c \
ps2.c ps2.c
@ -51,6 +50,10 @@ F_CPU = 16000000
PROGRAM_CMD = teensy_loader_cli -mmcu=$(MCU) -w -v $(TARGET).hex 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/pjrc.mk
include $(TOP_DIR)/protocol.mk include $(TOP_DIR)/protocol.mk

View file

@ -13,8 +13,7 @@ TOP_DIR = ../..
TARGET_DIR = . TARGET_DIR = .
# keyboard dependent files # keyboard dependent files
SRC = main.c \ SRC = keymap.c \
keymap.c \
matrix.c \ matrix.c \
led.c \ led.c \
x68k.c x68k.c
@ -80,6 +79,10 @@ AVRDUDE_FLAGS += $(AVRDUDE_ERASE_COUNTER)
PROGRAM_CMD = dfu-programmer atmega32u4 flash $(TARGET).hex 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/pjrc.mk
include $(TOP_DIR)/protocol.mk include $(TOP_DIR)/protocol.mk