~ruther/qmk_firmware

2769f09d11a4c45362f2e6137f2469d057d8757e — tmk 13 years ago 6d79e65
Fix Makefiles.
M converter/adb_usb/Makefile => converter/adb_usb/Makefile +4 -10
@@ 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

M converter/m0110_usb/Makefile => converter/m0110_usb/Makefile +5 -2
@@ 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

M converter/news_usb/Makefile.pjrc => converter/news_usb/Makefile.pjrc +5 -2
@@ 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

M converter/ps2_usb/Makefile => converter/ps2_usb/Makefile +5 -2
@@ 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

M converter/ps2_usb/Makefile.pjrc_usart => converter/ps2_usb/Makefile.pjrc_usart +5 -2
@@ 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

M converter/ps2_usb/Makefile.vusb => converter/ps2_usb/Makefile.vusb +13 -2
@@ 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

M converter/terminal_usb/Makefile.102_pjrc => converter/terminal_usb/Makefile.102_pjrc +5 -2
@@ 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

M converter/terminal_usb/Makefile.122_pjrc => converter/terminal_usb/Makefile.122_pjrc +5 -2
@@ 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

M converter/x68k_usb/Makefile => converter/x68k_usb/Makefile +5 -2
@@ 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