Nulo/qmk_firmware
1
0
Fork 0
Code Releases Activity

Fixed Makefile to adjust new directories.

Browse source
This commit is contained in:
tmk 2012-06-07 12:35:24 +09:00
parent f412570739
commit 63d82fcaeb
21 changed files with 84 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
adb_usb/Makefile
View file

@ -2,7 +2,7 @@
TARGET = adb_usb TARGET = adb_usb
# Directory common source filess exist # Directory common source filess exist
COMMON_DIR = .. TOP_DIR = ..
# Directory keyboard dependent files exist # Directory keyboard dependent files exist
TARGET_DIR = . TARGET_DIR = .
@ -48,5 +48,7 @@ PROGRAM_CMD = teensy_loader_cli -mmcu=$(MCU) -w -v $(TARGET).hex
include $(COMMON_DIR)/pjrc.mk include $(TOP_DIR)/protocol/pjrc.mk
include $(COMMON_DIR)/common.mk include $(TOP_DIR)/protocol.mk
include $(TOP_DIR)/common.mk
include $(TOP_DIR)/rules.mk

5
common.mk
View file

@ -33,7 +33,4 @@ ifdef $(or MOUSEKEY_ENABLE, PS2_MOUSE_ENABLE)
endif endif
# Search Path # Search Path
VPATH += $(COMMON_DIR) VPATH += $(TOP_DIR)/common
include $(COMMON_DIR)/rules.mk

0
common/mousekey.c Executable file → Normal file
View file

8
hbk/Makefile
View file

@ -2,7 +2,7 @@
TARGET = hbk TARGET = hbk
# Directory common source filess exist # Directory common source filess exist
COMMON_DIR = .. TOP_DIR = ..
# Directory keyboard dependent files exist # Directory keyboard dependent files exist
TARGET_DIR = . TARGET_DIR = .
@ -50,5 +50,7 @@ PROGRAM_CMD = /opt/dfu-programmer-0.5.2/bin/dfu-programmer $(MCU) erase && \
include $(COMMON_DIR)/pjrc.mk include $(TOP_DIR)/protocol/pjrc.mk
include $(COMMON_DIR)/common.mk include $(TOP_DIR)/protocol.mk
include $(TOP_DIR)/common.mk
include $(TOP_DIR)/rules.mk

10
hhkb/Makefile.iwrap
View file

@ -7,7 +7,7 @@
TARGET = hhkb_iwrap TARGET = hhkb_iwrap
# Directory common source filess exist # Directory common source filess exist
COMMON_DIR = .. TOP_DIR = ..
# Directory keyboard dependent files exist # Directory keyboard dependent files exist
TARGET_DIR = . TARGET_DIR = .
@ -85,7 +85,9 @@ PROGRAM_CMD = $(AVRDUDE) $(AVRDUDE_FLAGS) $(AVRDUDE_WRITE_FLASH) $(AVRDUDE_WRITE
# Search Path # Search Path
VPATH = $(TARGET_DIR) VPATH = $(TARGET_DIR)
include $(COMMON_DIR)/iwrap.mk include $(TOP_DIR)/protocol/iwrap.mk
# To be swatchable btween Bluetooth and USB. Comment out if you don't need USB. # To be swatchable btween Bluetooth and USB. Comment out if you don't need USB.
include $(COMMON_DIR)/vusb.mk include $(TOP_DIR)/protocol/vusb.mk
include $(COMMON_DIR)/common.mk include $(TOP_DIR)/protocol.mk
include $(TOP_DIR)/common.mk
include $(TOP_DIR)/rules.mk

8
hhkb/Makefile.pjrc
View file

@ -7,7 +7,7 @@
TARGET = hhkb_pjrc TARGET = hhkb_pjrc
# Directory common source filess exist # Directory common source filess exist
COMMON_DIR = .. TOP_DIR = ..
# Directory keyboard dependent files exist # Directory keyboard dependent files exist
TARGET_DIR = . TARGET_DIR = .
@ -54,5 +54,7 @@ PROGRAM_CMD = teensy_loader_cli -mmcu=$(MCU) -w -v $(TARGET).hex
# Search Path # Search Path
VPATH = $(TARGET_DIR) VPATH = $(TARGET_DIR)
include $(COMMON_DIR)/pjrc.mk include $(TOP_DIR)/protocol/pjrc.mk
include $(COMMON_DIR)/common.mk include $(TOP_DIR)/protocol.mk
include $(TOP_DIR)/common.mk
include $(TOP_DIR)/rules.mk

8
hhkb/Makefile.vusb
View file

@ -7,7 +7,7 @@
TARGET = hhkb_vusb TARGET = hhkb_vusb
# Directory common source filess exist # Directory common source filess exist
COMMON_DIR = .. TOP_DIR = ..
# Directory keyboard dependent files exist # Directory keyboard dependent files exist
TARGET_DIR = . TARGET_DIR = .
@ -85,5 +85,7 @@ PROGRAM_CMD = $(AVRDUDE) $(AVRDUDE_FLAGS) $(AVRDUDE_WRITE_FLASH) $(AVRDUDE_WRITE
# Search Path # Search Path
VPATH = $(TARGET_DIR) VPATH = $(TARGET_DIR)
include $(COMMON_DIR)/vusb.mk include $(TOP_DIR)/protocol/vusb.mk
include $(COMMON_DIR)/common.mk include $(TOP_DIR)/protocol.mk
include $(TOP_DIR)/common.mk
include $(TOP_DIR)/rules.mk

0
hhkb/doc/Bluetooth_img/BT_circuit.jpg Executable file → Normal file
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 490 KiB

After

Width:  |  Height:  |  Size: 490 KiB

8
m0110_usb/Makefile
View file

@ -2,7 +2,7 @@
TARGET = m0110 TARGET = m0110
# Directory common source filess exist # Directory common source filess exist
COMMON_DIR = .. TOP_DIR = ..
# Directory keyboard dependent files exist # Directory keyboard dependent files exist
TARGET_DIR = . TARGET_DIR = .
@ -48,8 +48,10 @@ PROGRAM_CMD = teensy_loader_cli -mmcu=$(MCU) -w -v $(TARGET).hex
include $(COMMON_DIR)/pjrc.mk include $(TOP_DIR)/protocol/pjrc.mk
include $(COMMON_DIR)/common.mk include $(TOP_DIR)/protocol.mk
include $(TOP_DIR)/common.mk
include $(TOP_DIR)/rules.mk
hasu: EXTRAFLAGS += -DHASU hasu: EXTRAFLAGS += -DHASU
hasu: all hasu: all

8
macway/Makefile
View file

@ -2,7 +2,7 @@
TARGET = macway TARGET = macway
# Directory common source filess exist # Directory common source filess exist
COMMON_DIR = .. TOP_DIR = ..
# Directory keyboard dependent files exist # Directory keyboard dependent files exist
TARGET_DIR = . TARGET_DIR = .
@ -47,5 +47,7 @@ PROGRAM_CMD = teensy_loader_cli -mmcu=$(MCU) -w -v $(TARGET).hex
include $(COMMON_DIR)/pjrc.mk include $(TOP_DIR)/protocol/pjrc.mk
include $(COMMON_DIR)/common.mk include $(TOP_DIR)/protocol.mk
include $(TOP_DIR)/common.mk
include $(TOP_DIR)/rules.mk

2
protocol/iwrap.mk
View file

@ -7,4 +7,4 @@ SRC += iwrap.c \
# Search Path # Search Path
VPATH += $(COMMON_DIR)/iwrap VPATH += $(TOP_DIR)/protocol/iwrap

2
protocol/pjrc.mk
View file

@ -8,7 +8,7 @@ SRC += pjrc.c \
# Search Path # Search Path
VPATH += $(COMMON_DIR):$(COMMON_DIR)/pjrc VPATH += $(TOP_DIR)/protocol/pjrc
# Option modules # Option modules

2
protocol/vusb.mk
View file

@ -16,4 +16,4 @@ endif
# Search Path # Search Path
VPATH += $(COMMON_DIR)/vusb:$(COMMON_DIR)/vusb/usbdrv VPATH += $(TOP_DIR)/protocol/vusb:$(TOP_DIR)/protocol/vusb/usbdrv

8
ps2_usb/Makefile
View file

@ -7,7 +7,7 @@
TARGET = ps2_usb_pjrc TARGET = ps2_usb_pjrc
# Directory common source filess exist # Directory common source filess exist
COMMON_DIR = .. TOP_DIR = ..
# Directory keyboard dependent files exist # Directory keyboard dependent files exist
TARGET_DIR = . TARGET_DIR = .
@ -52,5 +52,7 @@ PROGRAM_CMD = teensy_loader_cli -mmcu=$(MCU) -w -v $(TARGET).hex
include $(COMMON_DIR)/pjrc.mk include $(TOP_DIR)/protocol/pjrc.mk
include $(COMMON_DIR)/common.mk include $(TOP_DIR)/protocol.mk
include $(TOP_DIR)/common.mk
include $(TOP_DIR)/rules.mk

8
ps2_usb/Makefile.pjrc_usart
View file

@ -7,7 +7,7 @@
TARGET = ps2_usb_pjrc_usart TARGET = ps2_usb_pjrc_usart
# Directory common source filess exist # Directory common source filess exist
COMMON_DIR = .. TOP_DIR = ..
# Directory keyboard dependent files exist # Directory keyboard dependent files exist
TARGET_DIR = . TARGET_DIR = .
@ -52,5 +52,7 @@ PROGRAM_CMD = teensy_loader_cli -mmcu=$(MCU) -w -v $(TARGET).hex
include $(COMMON_DIR)/pjrc.mk include $(TOP_DIR)/protocol/pjrc.mk
include $(COMMON_DIR)/common.mk include $(TOP_DIR)/protocol.mk
include $(TOP_DIR)/common.mk
include $(TOP_DIR)/rules.mk

8
ps2_usb/Makefile.vusb
View file

@ -7,7 +7,7 @@
TARGET = ps2_usb_vusb TARGET = ps2_usb_vusb
# Directory common source filess exist # Directory common source filess exist
COMMON_DIR = .. TOP_DIR = ..
# Directory keyboard dependent files exist # Directory keyboard dependent files exist
TARGET_DIR = . TARGET_DIR = .
@ -86,5 +86,7 @@ PROGRAM_CMD = $(AVRDUDE) $(AVRDUDE_FLAGS) $(AVRDUDE_WRITE_FLASH) $(AVRDUDE_WRITE
include $(COMMON_DIR)/vusb.mk include $(TOP_DIR)/protocol/vusb.mk
include $(COMMON_DIR)/common.mk include $(TOP_DIR)/protocol.mk
include $(TOP_DIR)/common.mk
include $(TOP_DIR)/rules.mk

6
rules.mk
View file

@ -121,7 +121,9 @@ CFLAGS += -Wstrict-prototypes
CFLAGS += -Wa,-adhlns=$(@:%.o=%.lst) CFLAGS += -Wa,-adhlns=$(@:%.o=%.lst)
CFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS)) CFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS))
CFLAGS += $(CSTANDARD) CFLAGS += $(CSTANDARD)
ifdef CONFIG_H
CFLAGS += -include $(CONFIG_H) CFLAGS += -include $(CONFIG_H)
endif
#---------------- Compiler Options C++ ---------------- #---------------- Compiler Options C++ ----------------
@ -149,7 +151,9 @@ CPPFLAGS += -Wundef
CPPFLAGS += -Wa,-adhlns=$(@:%.o=%.lst) CPPFLAGS += -Wa,-adhlns=$(@:%.o=%.lst)
CPPFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS)) CPPFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS))
#CPPFLAGS += $(CSTANDARD) #CPPFLAGS += $(CSTANDARD)
ifdef CONFIG_H
CPPFLAGS += -include $(CONFIG_H) CPPFLAGS += -include $(CONFIG_H)
endif
#---------------- Assembler Options ---------------- #---------------- Assembler Options ----------------
@ -162,7 +166,9 @@ CPPFLAGS += -include $(CONFIG_H)
# -listing-cont-lines: Sets the maximum number of continuation lines of hex # -listing-cont-lines: Sets the maximum number of continuation lines of hex
# dump that will be displayed for a given single line of source input. # dump that will be displayed for a given single line of source input.
ASFLAGS = $(ADEFS) -Wa,-adhlns=$(@:%.o=%.lst),-gstabs,--listing-cont-lines=100 ASFLAGS = $(ADEFS) -Wa,-adhlns=$(@:%.o=%.lst),-gstabs,--listing-cont-lines=100
ifdef CONFIG_H
ASFLAGS += -include $(CONFIG_H) ASFLAGS += -include $(CONFIG_H)
endif
#---------------- Library Options ---------------- #---------------- Library Options ----------------

8
sony_usb/Makefile.pjrc
View file

@ -7,7 +7,7 @@
TARGET = news_usb_pjrc TARGET = news_usb_pjrc
# Directory common source filess exist # Directory common source filess exist
COMMON_DIR = .. TOP_DIR = ..
# Directory keyboard dependent files exist # Directory keyboard dependent files exist
TARGET_DIR = . TARGET_DIR = .
@ -52,5 +52,7 @@ PROGRAM_CMD = teensy_loader_cli -mmcu=$(MCU) -w -v $(TARGET).hex
include $(COMMON_DIR)/pjrc.mk include $(TOP_DIR)/protocol/pjrc.mk
include $(COMMON_DIR)/common.mk include $(TOP_DIR)/protocol.mk
include $(TOP_DIR)/common.mk
include $(TOP_DIR)/rules.mk

8
terminal_usb/Makefile.102_pjrc
View file

@ -7,7 +7,7 @@
TARGET = terminal_usb_102_pjrc TARGET = terminal_usb_102_pjrc
# Directory common source filess exist # Directory common source filess exist
COMMON_DIR = .. TOP_DIR = ..
# Directory keyboard dependent files exist # Directory keyboard dependent files exist
TARGET_DIR = . TARGET_DIR = .
@ -52,5 +52,7 @@ PROGRAM_CMD = teensy_loader_cli -mmcu=$(MCU) -w -v $(TARGET).hex
include $(COMMON_DIR)/pjrc.mk include $(TOP_DIR)/protocol/pjrc.mk
include $(COMMON_DIR)/common.mk include $(TOP_DIR)/protocol.mk
include $(TOP_DIR)/common.mk
include $(TOP_DIR)/rules.mk

8
terminal_usb/Makefile.122_pjrc
View file

@ -7,7 +7,7 @@
TARGET = terminal_usb_122_pjrc TARGET = terminal_usb_122_pjrc
# Directory common source filess exist # Directory common source filess exist
COMMON_DIR = .. TOP_DIR = ..
# Directory keyboard dependent files exist # Directory keyboard dependent files exist
TARGET_DIR = . TARGET_DIR = .
@ -52,5 +52,7 @@ PROGRAM_CMD = teensy_loader_cli -mmcu=$(MCU) -w -v $(TARGET).hex
include $(COMMON_DIR)/pjrc.mk include $(TOP_DIR)/protocol/pjrc.mk
include $(COMMON_DIR)/common.mk include $(TOP_DIR)/protocol.mk
include $(TOP_DIR)/common.mk
include $(TOP_DIR)/rules.mk

8
x68k_usb/Makefile
View file

@ -7,7 +7,7 @@
TARGET = x68k_usb_pjrc TARGET = x68k_usb_pjrc
# Directory common source filess exist # Directory common source filess exist
COMMON_DIR = .. TOP_DIR = ..
# Directory keyboard dependent files exist # Directory keyboard dependent files exist
TARGET_DIR = . TARGET_DIR = .
@ -81,5 +81,7 @@ PROGRAM_CMD = dfu-programmer atmega32u4 flash $(TARGET).hex
include $(COMMON_DIR)/pjrc.mk include $(TOP_DIR)/protocol/pjrc.mk
include $(COMMON_DIR)/common.mk include $(TOP_DIR)/protocol.mk
include $(TOP_DIR)/common.mk
include $(TOP_DIR)/rules.mk