diff --git a/adb_usb/Makefile b/adb_usb/Makefile index f4c5031cb..97850b0e8 100644 --- a/adb_usb/Makefile +++ b/adb_usb/Makefile @@ -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 diff --git a/common.mk b/common.mk index 03cbc296d..d0e04df86 100644 --- a/common.mk +++ b/common.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 diff --git a/common/mousekey.c b/common/mousekey.c old mode 100755 new mode 100644 diff --git a/hbk/Makefile b/hbk/Makefile index e03b45e3a..c441e2d7a 100644 --- a/hbk/Makefile +++ b/hbk/Makefile @@ -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 diff --git a/hhkb/Makefile.iwrap b/hhkb/Makefile.iwrap index cf020b94a..d922b0f50 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 17aa865dd..28b6b589d 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 371b36690..734b73a02 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 old mode 100755 new mode 100644 diff --git a/m0110_usb/Makefile b/m0110_usb/Makefile index fccfaa521..e4fa526c5 100644 --- a/m0110_usb/Makefile +++ b/m0110_usb/Makefile @@ -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 diff --git a/macway/Makefile b/macway/Makefile index b8b0a85e1..83d31b674 100644 --- a/macway/Makefile +++ b/macway/Makefile @@ -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 diff --git a/protocol/iwrap.mk b/protocol/iwrap.mk index ea4a6e972..d9906fd1b 100644 --- a/protocol/iwrap.mk +++ b/protocol/iwrap.mk @@ -7,4 +7,4 @@ SRC += iwrap.c \ # Search Path -VPATH += $(COMMON_DIR)/iwrap +VPATH += $(TOP_DIR)/protocol/iwrap diff --git a/protocol/pjrc.mk b/protocol/pjrc.mk index e13a809a1..1ee45e9ec 100644 --- a/protocol/pjrc.mk +++ b/protocol/pjrc.mk @@ -8,7 +8,7 @@ SRC += pjrc.c \ # Search Path -VPATH += $(COMMON_DIR):$(COMMON_DIR)/pjrc +VPATH += $(TOP_DIR)/protocol/pjrc # Option modules diff --git a/protocol/vusb.mk b/protocol/vusb.mk index 9426efb25..9e8e1fb39 100644 --- a/protocol/vusb.mk +++ b/protocol/vusb.mk @@ -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 diff --git a/ps2_usb/Makefile b/ps2_usb/Makefile index f003aea01..515e6899f 100644 --- a/ps2_usb/Makefile +++ b/ps2_usb/Makefile @@ -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 diff --git a/ps2_usb/Makefile.pjrc_usart b/ps2_usb/Makefile.pjrc_usart index e620e66c2..2e570e710 100644 --- a/ps2_usb/Makefile.pjrc_usart +++ b/ps2_usb/Makefile.pjrc_usart @@ -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 diff --git a/ps2_usb/Makefile.vusb b/ps2_usb/Makefile.vusb index 5b6978f01..d85f1d55d 100644 --- a/ps2_usb/Makefile.vusb +++ b/ps2_usb/Makefile.vusb @@ -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 diff --git a/rules.mk b/rules.mk index 9143f9bcf..104031fbb 100644 --- a/rules.mk +++ b/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 ---------------- diff --git a/sony_usb/Makefile.pjrc b/sony_usb/Makefile.pjrc index 2a4eeff13..b7e22dfac 100644 --- a/sony_usb/Makefile.pjrc +++ b/sony_usb/Makefile.pjrc @@ -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 diff --git a/terminal_usb/Makefile.102_pjrc b/terminal_usb/Makefile.102_pjrc index c1fd397f6..a02877acf 100644 --- a/terminal_usb/Makefile.102_pjrc +++ b/terminal_usb/Makefile.102_pjrc @@ -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 diff --git a/terminal_usb/Makefile.122_pjrc b/terminal_usb/Makefile.122_pjrc index b91e484ff..1f21d4e6c 100644 --- a/terminal_usb/Makefile.122_pjrc +++ b/terminal_usb/Makefile.122_pjrc @@ -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 diff --git a/x68k_usb/Makefile b/x68k_usb/Makefile index c4b9b221b..0127c0bf8 100644 --- a/x68k_usb/Makefile +++ b/x68k_usb/Makefile @@ -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