diff options
| author | tmk <nobody@nowhere> | 2012-06-07 12:35:24 +0900 |
|---|---|---|
| committer | tmk <nobody@nowhere> | 2012-06-07 12:35:24 +0900 |
| commit | 63d82fcaeb78d0764f39667b937262ed4a692c17 (patch) | |
| tree | 95c70db82410a69084594555a435b0a009ba68e9 /hhkb | |
| parent | f4125707399d11a7d80587659c464b9bcddb8c56 (diff) | |
Fixed Makefile to adjust new directories.
Diffstat (limited to 'hhkb')
| -rw-r--r-- | hhkb/Makefile.iwrap | 10 | ||||
| -rw-r--r-- | hhkb/Makefile.pjrc | 8 | ||||
| -rw-r--r-- | hhkb/Makefile.vusb | 8 | ||||
| -rw-r--r--[-rwxr-xr-x] | hhkb/doc/Bluetooth_img/BT_circuit.jpg | bin | 502118 -> 502118 bytes |
4 files changed, 16 insertions, 10 deletions
diff --git a/hhkb/Makefile.iwrap b/hhkb/Makefile.iwrap index cf020b94aa..d922b0f501 100644 --- a/hhkb/Makefile.iwrap +++ b/hhkb/Makefile.iwrap @@ -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 diff --git a/hhkb/Makefile.pjrc b/hhkb/Makefile.pjrc index 17aa865ddc..28b6b589dd 100644 --- a/hhkb/Makefile.pjrc +++ b/hhkb/Makefile.pjrc @@ -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 diff --git a/hhkb/Makefile.vusb b/hhkb/Makefile.vusb index 371b366900..734b73a029 100644 --- a/hhkb/Makefile.vusb +++ b/hhkb/Makefile.vusb @@ -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 diff --git a/hhkb/doc/Bluetooth_img/BT_circuit.jpg b/hhkb/doc/Bluetooth_img/BT_circuit.jpg Binary files differindex 2e5a25e81e..2e5a25e81e 100755..100644 --- a/hhkb/doc/Bluetooth_img/BT_circuit.jpg +++ b/hhkb/doc/Bluetooth_img/BT_circuit.jpg |
