Fixed Makefile to adjust new directories.
This commit is contained in:
parent
f412570739
commit
63d82fcaeb
@ -2,7 +2,7 @@
|
||||
TARGET = adb_usb
|
||||
|
||||
# Directory common source filess exist
|
||||
COMMON_DIR = ..
|
||||
TOP_DIR = ..
|
||||
|
||||
# Directory keyboard dependent files exist
|
||||
TARGET_DIR = .
|
||||
@ -48,5 +48,7 @@ PROGRAM_CMD = teensy_loader_cli -mmcu=$(MCU) -w -v $(TARGET).hex
|
||||
|
||||
|
||||
|
||||
include $(COMMON_DIR)/pjrc.mk
|
||||
include $(COMMON_DIR)/common.mk
|
||||
include $(TOP_DIR)/protocol/pjrc.mk
|
||||
include $(TOP_DIR)/protocol.mk
|
||||
include $(TOP_DIR)/common.mk
|
||||
include $(TOP_DIR)/rules.mk
|
||||
|
@ -33,7 +33,4 @@ ifdef $(or MOUSEKEY_ENABLE, PS2_MOUSE_ENABLE)
|
||||
endif
|
||||
|
||||
# Search Path
|
||||
VPATH += $(COMMON_DIR)
|
||||
|
||||
|
||||
include $(COMMON_DIR)/rules.mk
|
||||
VPATH += $(TOP_DIR)/common
|
||||
|
0
common/mousekey.c
Executable file → Normal file
0
common/mousekey.c
Executable file → Normal file
@ -2,7 +2,7 @@
|
||||
TARGET = hbk
|
||||
|
||||
# Directory common source filess exist
|
||||
COMMON_DIR = ..
|
||||
TOP_DIR = ..
|
||||
|
||||
# Directory keyboard dependent files exist
|
||||
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 $(COMMON_DIR)/common.mk
|
||||
include $(TOP_DIR)/protocol/pjrc.mk
|
||||
include $(TOP_DIR)/protocol.mk
|
||||
include $(TOP_DIR)/common.mk
|
||||
include $(TOP_DIR)/rules.mk
|
||||
|
@ -7,7 +7,7 @@
|
||||
TARGET = hhkb_iwrap
|
||||
|
||||
# Directory common source filess exist
|
||||
COMMON_DIR = ..
|
||||
TOP_DIR = ..
|
||||
|
||||
# Directory keyboard dependent files exist
|
||||
TARGET_DIR = .
|
||||
@ -85,7 +85,9 @@ PROGRAM_CMD = $(AVRDUDE) $(AVRDUDE_FLAGS) $(AVRDUDE_WRITE_FLASH) $(AVRDUDE_WRITE
|
||||
# Search Path
|
||||
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.
|
||||
include $(COMMON_DIR)/vusb.mk
|
||||
include $(COMMON_DIR)/common.mk
|
||||
include $(TOP_DIR)/protocol/vusb.mk
|
||||
include $(TOP_DIR)/protocol.mk
|
||||
include $(TOP_DIR)/common.mk
|
||||
include $(TOP_DIR)/rules.mk
|
||||
|
@ -7,7 +7,7 @@
|
||||
TARGET = hhkb_pjrc
|
||||
|
||||
# Directory common source filess exist
|
||||
COMMON_DIR = ..
|
||||
TOP_DIR = ..
|
||||
|
||||
# Directory keyboard dependent files exist
|
||||
TARGET_DIR = .
|
||||
@ -54,5 +54,7 @@ PROGRAM_CMD = teensy_loader_cli -mmcu=$(MCU) -w -v $(TARGET).hex
|
||||
# Search Path
|
||||
VPATH = $(TARGET_DIR)
|
||||
|
||||
include $(COMMON_DIR)/pjrc.mk
|
||||
include $(COMMON_DIR)/common.mk
|
||||
include $(TOP_DIR)/protocol/pjrc.mk
|
||||
include $(TOP_DIR)/protocol.mk
|
||||
include $(TOP_DIR)/common.mk
|
||||
include $(TOP_DIR)/rules.mk
|
||||
|
@ -7,7 +7,7 @@
|
||||
TARGET = hhkb_vusb
|
||||
|
||||
# Directory common source filess exist
|
||||
COMMON_DIR = ..
|
||||
TOP_DIR = ..
|
||||
|
||||
# Directory keyboard dependent files exist
|
||||
TARGET_DIR = .
|
||||
@ -85,5 +85,7 @@ PROGRAM_CMD = $(AVRDUDE) $(AVRDUDE_FLAGS) $(AVRDUDE_WRITE_FLASH) $(AVRDUDE_WRITE
|
||||
# Search Path
|
||||
VPATH = $(TARGET_DIR)
|
||||
|
||||
include $(COMMON_DIR)/vusb.mk
|
||||
include $(COMMON_DIR)/common.mk
|
||||
include $(TOP_DIR)/protocol/vusb.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
0
hhkb/doc/Bluetooth_img/BT_circuit.jpg
Executable file → Normal file
Before Width: | Height: | Size: 490 KiB After Width: | Height: | Size: 490 KiB |
@ -2,7 +2,7 @@
|
||||
TARGET = m0110
|
||||
|
||||
# Directory common source filess exist
|
||||
COMMON_DIR = ..
|
||||
TOP_DIR = ..
|
||||
|
||||
# Directory keyboard dependent files exist
|
||||
TARGET_DIR = .
|
||||
@ -48,8 +48,10 @@ PROGRAM_CMD = teensy_loader_cli -mmcu=$(MCU) -w -v $(TARGET).hex
|
||||
|
||||
|
||||
|
||||
include $(COMMON_DIR)/pjrc.mk
|
||||
include $(COMMON_DIR)/common.mk
|
||||
include $(TOP_DIR)/protocol/pjrc.mk
|
||||
include $(TOP_DIR)/protocol.mk
|
||||
include $(TOP_DIR)/common.mk
|
||||
include $(TOP_DIR)/rules.mk
|
||||
|
||||
hasu: EXTRAFLAGS += -DHASU
|
||||
hasu: all
|
||||
|
@ -2,7 +2,7 @@
|
||||
TARGET = macway
|
||||
|
||||
# Directory common source filess exist
|
||||
COMMON_DIR = ..
|
||||
TOP_DIR = ..
|
||||
|
||||
# Directory keyboard dependent files exist
|
||||
TARGET_DIR = .
|
||||
@ -47,5 +47,7 @@ PROGRAM_CMD = teensy_loader_cli -mmcu=$(MCU) -w -v $(TARGET).hex
|
||||
|
||||
|
||||
|
||||
include $(COMMON_DIR)/pjrc.mk
|
||||
include $(COMMON_DIR)/common.mk
|
||||
include $(TOP_DIR)/protocol/pjrc.mk
|
||||
include $(TOP_DIR)/protocol.mk
|
||||
include $(TOP_DIR)/common.mk
|
||||
include $(TOP_DIR)/rules.mk
|
||||
|
@ -7,4 +7,4 @@ SRC += iwrap.c \
|
||||
|
||||
|
||||
# Search Path
|
||||
VPATH += $(COMMON_DIR)/iwrap
|
||||
VPATH += $(TOP_DIR)/protocol/iwrap
|
||||
|
@ -8,7 +8,7 @@ SRC += pjrc.c \
|
||||
|
||||
|
||||
# Search Path
|
||||
VPATH += $(COMMON_DIR):$(COMMON_DIR)/pjrc
|
||||
VPATH += $(TOP_DIR)/protocol/pjrc
|
||||
|
||||
|
||||
# Option modules
|
||||
|
@ -16,4 +16,4 @@ endif
|
||||
|
||||
|
||||
# Search Path
|
||||
VPATH += $(COMMON_DIR)/vusb:$(COMMON_DIR)/vusb/usbdrv
|
||||
VPATH += $(TOP_DIR)/protocol/vusb:$(TOP_DIR)/protocol/vusb/usbdrv
|
||||
|
@ -7,7 +7,7 @@
|
||||
TARGET = ps2_usb_pjrc
|
||||
|
||||
# Directory common source filess exist
|
||||
COMMON_DIR = ..
|
||||
TOP_DIR = ..
|
||||
|
||||
# Directory keyboard dependent files exist
|
||||
TARGET_DIR = .
|
||||
@ -52,5 +52,7 @@ PROGRAM_CMD = teensy_loader_cli -mmcu=$(MCU) -w -v $(TARGET).hex
|
||||
|
||||
|
||||
|
||||
include $(COMMON_DIR)/pjrc.mk
|
||||
include $(COMMON_DIR)/common.mk
|
||||
include $(TOP_DIR)/protocol/pjrc.mk
|
||||
include $(TOP_DIR)/protocol.mk
|
||||
include $(TOP_DIR)/common.mk
|
||||
include $(TOP_DIR)/rules.mk
|
||||
|
@ -7,7 +7,7 @@
|
||||
TARGET = ps2_usb_pjrc_usart
|
||||
|
||||
# Directory common source filess exist
|
||||
COMMON_DIR = ..
|
||||
TOP_DIR = ..
|
||||
|
||||
# Directory keyboard dependent files exist
|
||||
TARGET_DIR = .
|
||||
@ -52,5 +52,7 @@ PROGRAM_CMD = teensy_loader_cli -mmcu=$(MCU) -w -v $(TARGET).hex
|
||||
|
||||
|
||||
|
||||
include $(COMMON_DIR)/pjrc.mk
|
||||
include $(COMMON_DIR)/common.mk
|
||||
include $(TOP_DIR)/protocol/pjrc.mk
|
||||
include $(TOP_DIR)/protocol.mk
|
||||
include $(TOP_DIR)/common.mk
|
||||
include $(TOP_DIR)/rules.mk
|
||||
|
@ -7,7 +7,7 @@
|
||||
TARGET = ps2_usb_vusb
|
||||
|
||||
# Directory common source filess exist
|
||||
COMMON_DIR = ..
|
||||
TOP_DIR = ..
|
||||
|
||||
# Directory keyboard dependent files exist
|
||||
TARGET_DIR = .
|
||||
@ -86,5 +86,7 @@ PROGRAM_CMD = $(AVRDUDE) $(AVRDUDE_FLAGS) $(AVRDUDE_WRITE_FLASH) $(AVRDUDE_WRITE
|
||||
|
||||
|
||||
|
||||
include $(COMMON_DIR)/vusb.mk
|
||||
include $(COMMON_DIR)/common.mk
|
||||
include $(TOP_DIR)/protocol/vusb.mk
|
||||
include $(TOP_DIR)/protocol.mk
|
||||
include $(TOP_DIR)/common.mk
|
||||
include $(TOP_DIR)/rules.mk
|
||||
|
12
rules.mk
12
rules.mk
@ -121,7 +121,9 @@ CFLAGS += -Wstrict-prototypes
|
||||
CFLAGS += -Wa,-adhlns=$(@:%.o=%.lst)
|
||||
CFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS))
|
||||
CFLAGS += $(CSTANDARD)
|
||||
CFLAGS += -include $(CONFIG_H)
|
||||
ifdef CONFIG_H
|
||||
CFLAGS += -include $(CONFIG_H)
|
||||
endif
|
||||
|
||||
|
||||
#---------------- Compiler Options C++ ----------------
|
||||
@ -149,7 +151,9 @@ CPPFLAGS += -Wundef
|
||||
CPPFLAGS += -Wa,-adhlns=$(@:%.o=%.lst)
|
||||
CPPFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS))
|
||||
#CPPFLAGS += $(CSTANDARD)
|
||||
CPPFLAGS += -include $(CONFIG_H)
|
||||
ifdef CONFIG_H
|
||||
CPPFLAGS += -include $(CONFIG_H)
|
||||
endif
|
||||
|
||||
|
||||
#---------------- Assembler Options ----------------
|
||||
@ -162,7 +166,9 @@ CPPFLAGS += -include $(CONFIG_H)
|
||||
# -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.
|
||||
ASFLAGS = $(ADEFS) -Wa,-adhlns=$(@:%.o=%.lst),-gstabs,--listing-cont-lines=100
|
||||
ASFLAGS += -include $(CONFIG_H)
|
||||
ifdef CONFIG_H
|
||||
ASFLAGS += -include $(CONFIG_H)
|
||||
endif
|
||||
|
||||
|
||||
#---------------- Library Options ----------------
|
||||
|
@ -7,7 +7,7 @@
|
||||
TARGET = news_usb_pjrc
|
||||
|
||||
# Directory common source filess exist
|
||||
COMMON_DIR = ..
|
||||
TOP_DIR = ..
|
||||
|
||||
# Directory keyboard dependent files exist
|
||||
TARGET_DIR = .
|
||||
@ -52,5 +52,7 @@ PROGRAM_CMD = teensy_loader_cli -mmcu=$(MCU) -w -v $(TARGET).hex
|
||||
|
||||
|
||||
|
||||
include $(COMMON_DIR)/pjrc.mk
|
||||
include $(COMMON_DIR)/common.mk
|
||||
include $(TOP_DIR)/protocol/pjrc.mk
|
||||
include $(TOP_DIR)/protocol.mk
|
||||
include $(TOP_DIR)/common.mk
|
||||
include $(TOP_DIR)/rules.mk
|
||||
|
@ -7,7 +7,7 @@
|
||||
TARGET = terminal_usb_102_pjrc
|
||||
|
||||
# Directory common source filess exist
|
||||
COMMON_DIR = ..
|
||||
TOP_DIR = ..
|
||||
|
||||
# Directory keyboard dependent files exist
|
||||
TARGET_DIR = .
|
||||
@ -52,5 +52,7 @@ PROGRAM_CMD = teensy_loader_cli -mmcu=$(MCU) -w -v $(TARGET).hex
|
||||
|
||||
|
||||
|
||||
include $(COMMON_DIR)/pjrc.mk
|
||||
include $(COMMON_DIR)/common.mk
|
||||
include $(TOP_DIR)/protocol/pjrc.mk
|
||||
include $(TOP_DIR)/protocol.mk
|
||||
include $(TOP_DIR)/common.mk
|
||||
include $(TOP_DIR)/rules.mk
|
||||
|
@ -7,7 +7,7 @@
|
||||
TARGET = terminal_usb_122_pjrc
|
||||
|
||||
# Directory common source filess exist
|
||||
COMMON_DIR = ..
|
||||
TOP_DIR = ..
|
||||
|
||||
# Directory keyboard dependent files exist
|
||||
TARGET_DIR = .
|
||||
@ -52,5 +52,7 @@ PROGRAM_CMD = teensy_loader_cli -mmcu=$(MCU) -w -v $(TARGET).hex
|
||||
|
||||
|
||||
|
||||
include $(COMMON_DIR)/pjrc.mk
|
||||
include $(COMMON_DIR)/common.mk
|
||||
include $(TOP_DIR)/protocol/pjrc.mk
|
||||
include $(TOP_DIR)/protocol.mk
|
||||
include $(TOP_DIR)/common.mk
|
||||
include $(TOP_DIR)/rules.mk
|
||||
|
@ -7,7 +7,7 @@
|
||||
TARGET = x68k_usb_pjrc
|
||||
|
||||
# Directory common source filess exist
|
||||
COMMON_DIR = ..
|
||||
TOP_DIR = ..
|
||||
|
||||
# Directory keyboard dependent files exist
|
||||
TARGET_DIR = .
|
||||
@ -81,5 +81,7 @@ PROGRAM_CMD = dfu-programmer atmega32u4 flash $(TARGET).hex
|
||||
|
||||
|
||||
|
||||
include $(COMMON_DIR)/pjrc.mk
|
||||
include $(COMMON_DIR)/common.mk
|
||||
include $(TOP_DIR)/protocol/pjrc.mk
|
||||
include $(TOP_DIR)/protocol.mk
|
||||
include $(TOP_DIR)/common.mk
|
||||
include $(TOP_DIR)/rules.mk
|
||||
|
Loading…
Reference in New Issue
Block a user