Fixed Makefile to adjust new directories.

21 files changed, 84 insertions, 53 deletions

diff --git a/adb_usb/Makefile b/adb_usb/Makefile
index f4c5031cb6..97850b0e86 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 03cbc296d8..d0e04df862 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
index 76bd0fd363..76bd0fd363 100755..100644
--- a/common/mousekey.c
+++ b/common/mousekey.c
diff --git a/hbk/Makefile b/hbk/Makefile
index e03b45e3a4..c441e2d7ae 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 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
index 2e5a25e81e..2e5a25e81e 100755..100644
--- a/hhkb/doc/Bluetooth_img/BT_circuit.jpg
+++ b/hhkb/doc/Bluetooth_img/BT_circuit.jpg
diff --git a/m0110_usb/Makefile b/m0110_usb/Makefile
index fccfaa521b..e4fa526c55 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 b8b0a85e1e..83d31b6747 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 ea4a6e9720..d9906fd1b4 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 e13a809a1a..1ee45e9ec9 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 9426efb25a..9e8e1fb39e 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 f003aea01d..515e6899fe 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 e620e66c25..2e570e7107 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 5b6978f015..d85f1d55d5 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 9143f9bcff..104031fbb2 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 2a4eeff13a..b7e22dface 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 c1fd397f6c..a02877acfe 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 b91e484ff2..1f21d4e6ca 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 c4b9b221b0..0127c0bf84 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