Change TOP_DIR to TMK_DIR in makefiles

diff --git a/common.mk b/common.mk
index b854f09cdbf98a0dd2d872d084140911e20c293e..d22adff519c3d7836f79d5120b5752ace205a4ad 100644 (file)
--- a/common.mk
+++ b/common.mk
@@ -66,7 +66,7 @@ endif
 
 ifdef KEYMAP_SECTION_ENABLE
     OPT_DEFS += -DKEYMAP_SECTION_ENABLE
-    EXTRALDFLAGS = -Wl,-L$(TOP_DIR),-Tldscript_keymap_avr5.x
+    EXTRALDFLAGS = -Wl,-L$(TMK_DIR),-Tldscript_keymap_avr5.x
 endif
 
 # Version string
@@ -74,4 +74,4 @@ OPT_DEFS += -DVERSION=$(shell (git describe --always --dirty || echo 'unknown')
 
 
 # Search Path
-VPATH += $(TOP_DIR)/common
+VPATH += $(TMK_DIR)/common

diff --git a/converter/adb_usb/Makefile b/converter/adb_usb/Makefile
index bbb7810eef3bf9a4c3a054d78a9b78709b16d9e5..16770fa4106a586311b47c93db20b8b70c63fdae 100644 (file)
--- a/converter/adb_usb/Makefile
+++ b/converter/adb_usb/Makefile
@@ -42,7 +42,7 @@
 TARGET = adb_usb_lufa
 
 # Directory common source filess exist
-TOP_DIR = ../..
+TMK_DIR = ../..
 
 # Directory keyboard dependent files exist
 TARGET_DIR = .
@@ -129,9 +129,9 @@ COMMAND_ENABLE = yes    # Commands for debug and configuration
 
 # Search Path
 VPATH += $(TARGET_DIR)
-VPATH += $(TOP_DIR)
+VPATH += $(TMK_DIR)
 
-include $(TOP_DIR)/protocol/lufa.mk
-include $(TOP_DIR)/protocol.mk
-include $(TOP_DIR)/common.mk
-include $(TOP_DIR)/rules.mk
+include $(TMK_DIR)/protocol/lufa.mk
+include $(TMK_DIR)/protocol.mk
+include $(TMK_DIR)/common.mk
+include $(TMK_DIR)/rules.mk

diff --git a/converter/adb_usb/Makefile.pjrc b/converter/adb_usb/Makefile.pjrc
index 2eb41b34b43e5a522ac47bf99fb2616a3d5348cc..69e2325f95133bb996942f4117f645918d8730e0 100644 (file)
--- a/converter/adb_usb/Makefile.pjrc
+++ b/converter/adb_usb/Makefile.pjrc
@@ -2,7 +2,7 @@
 TARGET = adb_usb_pjrc
 
 # Directory common source filess exist
-TOP_DIR = ../..
+TMK_DIR = ../..
 
 # Directory keyboard dependent files exist
 TARGET_DIR = .
@@ -61,9 +61,9 @@ COMMAND_ENABLE = yes    # Commands for debug and configuration
 
 # Search Path
 VPATH += $(TARGET_DIR)
-VPATH += $(TOP_DIR)
+VPATH += $(TMK_DIR)
 
-include $(TOP_DIR)/protocol/pjrc.mk
-include $(TOP_DIR)/protocol.mk
-include $(TOP_DIR)/common.mk
-include $(TOP_DIR)/rules.mk
+include $(TMK_DIR)/protocol/pjrc.mk
+include $(TMK_DIR)/protocol.mk
+include $(TMK_DIR)/common.mk
+include $(TMK_DIR)/rules.mk

diff --git a/converter/ascii_usb/Makefile b/converter/ascii_usb/Makefile
index 408aa423751cae4107c404ccfed624462ded9742..b9549e38a47329c88da54a8d9188156747834a40 100644 (file)
--- a/converter/ascii_usb/Makefile
+++ b/converter/ascii_usb/Makefile
@@ -2,7 +2,7 @@
 TARGET = ascii_usb
 
 # Directory common source filess exist
-TOP_DIR = ../..
+TMK_DIR = ../..
 
 # Directory keyboard dependent files exist
 TARGET_DIR = .
@@ -73,10 +73,10 @@ OPT_DEFS += -DBOOTLOADER_SIZE=4096
 
 # Search Path
 VPATH += $(TARGET_DIR)
-VPATH += $(TOP_DIR)
+VPATH += $(TMK_DIR)
 
 
-include $(TOP_DIR)/protocol/lufa.mk
-include $(TOP_DIR)/protocol.mk
-include $(TOP_DIR)/common.mk
-include $(TOP_DIR)/rules.mk
+include $(TMK_DIR)/protocol/lufa.mk
+include $(TMK_DIR)/protocol.mk
+include $(TMK_DIR)/common.mk
+include $(TMK_DIR)/rules.mk

diff --git a/converter/ibm4704_usb/Makefile b/converter/ibm4704_usb/Makefile
index 112b00129dc24ee270df06c53bb555a89344ca99..c1e8c385dfe3b3bc0fb5a542cab1afa8035650e5 100644 (file)
--- a/converter/ibm4704_usb/Makefile
+++ b/converter/ibm4704_usb/Makefile
@@ -2,7 +2,7 @@
 TARGET = ibm4704_usb
 
 # Directory common source filess exist
-TOP_DIR = ../..
+TMK_DIR = ../..
 
 # Directory keyboard dependent files exist
 TARGET_DIR = .
@@ -85,9 +85,9 @@ COMMAND_ENABLE = yes    # Commands for debug and configuration
 
 # Search Path
 VPATH += $(TARGET_DIR)
-VPATH += $(TOP_DIR)
+VPATH += $(TMK_DIR)
 
-include $(TOP_DIR)/protocol.mk
-include $(TOP_DIR)/protocol/lufa.mk
-include $(TOP_DIR)/common.mk
-include $(TOP_DIR)/rules.mk
+include $(TMK_DIR)/protocol.mk
+include $(TMK_DIR)/protocol/lufa.mk
+include $(TMK_DIR)/common.mk
+include $(TMK_DIR)/rules.mk

diff --git a/converter/m0110_usb/Makefile b/converter/m0110_usb/Makefile
index 6f20396f59c2a3d811cb6bfca451893ecd17a362..466285fe97f31a30dc5f9138a03b1fc695a37956 100644 (file)
--- a/converter/m0110_usb/Makefile
+++ b/converter/m0110_usb/Makefile
@@ -2,7 +2,7 @@
 TARGET = m0110_lufa
 
 # Directory common source filess exist
-TOP_DIR = ../..
+TMK_DIR = ../..
 
 # Directory keyboard dependent files exist
 TARGET_DIR = .
@@ -87,10 +87,10 @@ PROGRAM_CMD = teensy_loader_cli -mmcu=$(MCU) -w -v $(TARGET).hex
 
 # Search Path
 VPATH += $(TARGET_DIR)
-VPATH += $(TOP_DIR)
+VPATH += $(TMK_DIR)
 
 
-include $(TOP_DIR)/protocol/lufa.mk
-include $(TOP_DIR)/protocol.mk
-include $(TOP_DIR)/common.mk
-include $(TOP_DIR)/rules.mk
+include $(TMK_DIR)/protocol/lufa.mk
+include $(TMK_DIR)/protocol.mk
+include $(TMK_DIR)/common.mk
+include $(TMK_DIR)/rules.mk

diff --git a/converter/m0110_usb/Makefile.pjrc b/converter/m0110_usb/Makefile.pjrc
index 37977a384b5746ccbff310e555919d8ac21b065d..5faf5c2552065b3f6f5e77cd2b66c1c6d21eb3d6 100644 (file)
--- a/converter/m0110_usb/Makefile.pjrc
+++ b/converter/m0110_usb/Makefile.pjrc
@@ -2,7 +2,7 @@
 TARGET = m0110_pjrc
 
 # Directory common source filess exist
-TOP_DIR = ../..
+TMK_DIR = ../..
 
 # Directory keyboard dependent files exist
 TARGET_DIR = .
@@ -64,10 +64,10 @@ PROGRAM_CMD = teensy_loader_cli -mmcu=$(MCU) -w -v $(TARGET).hex
 
 # Search Path
 VPATH += $(TARGET_DIR)
-VPATH += $(TOP_DIR)
+VPATH += $(TMK_DIR)
 
 
-include $(TOP_DIR)/protocol/pjrc.mk
-include $(TOP_DIR)/protocol.mk
-include $(TOP_DIR)/common.mk
-include $(TOP_DIR)/rules.mk
+include $(TMK_DIR)/protocol/pjrc.mk
+include $(TMK_DIR)/protocol.mk
+include $(TMK_DIR)/common.mk
+include $(TMK_DIR)/rules.mk

diff --git a/converter/m0110_usb/Makefile.teensy b/converter/m0110_usb/Makefile.teensy
index 9a5c41068e1274175c1134839286d6df0b196623..f664b67538ccc6041ed3c33a8e2aba09a5708a42 100644 (file)
--- a/converter/m0110_usb/Makefile.teensy
+++ b/converter/m0110_usb/Makefile.teensy
@@ -2,7 +2,7 @@
 TARGET = m0110_lufa
 
 # Directory common source filess exist
-TOP_DIR = ../..
+TMK_DIR = ../..
 
 # Directory keyboard dependent files exist
 TARGET_DIR = .
@@ -89,10 +89,10 @@ PROGRAM_CMD = teensy_loader_cli -mmcu=$(MCU) -w -v $(TARGET).hex
 
 # Search Path
 VPATH += $(TARGET_DIR)
-VPATH += $(TOP_DIR)
+VPATH += $(TMK_DIR)
 
 
-include $(TOP_DIR)/protocol/lufa.mk
-include $(TOP_DIR)/protocol.mk
-include $(TOP_DIR)/common.mk
-include $(TOP_DIR)/rules.mk
+include $(TMK_DIR)/protocol/lufa.mk
+include $(TMK_DIR)/protocol.mk
+include $(TMK_DIR)/common.mk
+include $(TMK_DIR)/rules.mk

diff --git a/converter/news_usb/Makefile.pjrc b/converter/news_usb/Makefile.pjrc
index 98f8d57693dd486e7190ca99e0e50903be41d5b7..29b27acf635a6c12857a1bbe3e99b4dcea8b8775 100644 (file)
--- a/converter/news_usb/Makefile.pjrc
+++ b/converter/news_usb/Makefile.pjrc
@@ -7,7 +7,7 @@
 TARGET = news_usb_pjrc
 
 # Directory common source filess exist
-TOP_DIR = ../..
+TMK_DIR = ../..
 
 # Directory keyboard dependent files exist
 TARGET_DIR = .
@@ -65,10 +65,10 @@ PROGRAM_CMD = teensy_loader_cli -mmcu=$(MCU) -w -v $(TARGET).hex
 
 # Search Path
 VPATH += $(TARGET_DIR)
-VPATH += $(TOP_DIR)
+VPATH += $(TMK_DIR)
 
 
-include $(TOP_DIR)/protocol/pjrc.mk
-include $(TOP_DIR)/protocol.mk
-include $(TOP_DIR)/common.mk
-include $(TOP_DIR)/rules.mk
+include $(TMK_DIR)/protocol/pjrc.mk
+include $(TMK_DIR)/protocol.mk
+include $(TMK_DIR)/common.mk
+include $(TMK_DIR)/rules.mk

diff --git a/converter/next_usb/Makefile b/converter/next_usb/Makefile
index fef539a147da3ec5e1cb211faeee606db0e56f27..719081f9b3f72b4530e7f72d6bcc69c298325306 100644 (file)
--- a/converter/next_usb/Makefile
+++ b/converter/next_usb/Makefile
@@ -2,7 +2,7 @@
 TARGET = next_usb
 
 # Directory common source filess exist
-TOP_DIR = ../..
+TMK_DIR = ../..
 
 # Directory keyboard dependent files exist
 TARGET_DIR = .
@@ -78,10 +78,10 @@ SRC += next_kbd.c
 
 # Search Path
 VPATH += $(TARGET_DIR)
-VPATH += $(TOP_DIR)
+VPATH += $(TMK_DIR)
 
 
-include $(TOP_DIR)/protocol.mk
-include $(TOP_DIR)/protocol/lufa.mk
-include $(TOP_DIR)/common.mk
-include $(TOP_DIR)/rules.mk
+include $(TMK_DIR)/protocol.mk
+include $(TMK_DIR)/protocol/lufa.mk
+include $(TMK_DIR)/common.mk
+include $(TMK_DIR)/rules.mk

diff --git a/converter/next_usb/Makefile.pjrc b/converter/next_usb/Makefile.pjrc
index 51d9de6b117977c0cf0e29775113074181522da1..75ca13c9eef9c18e31ea7c850c7a9d9ba231126c 100644 (file)
--- a/converter/next_usb/Makefile.pjrc
+++ b/converter/next_usb/Makefile.pjrc
@@ -2,7 +2,7 @@
 TARGET = next_usb
 
 # Directory common source filess exist
-TOP_DIR = ../..
+TMK_DIR = ../..
 
 # Directory keyboard dependent files exist
 TARGET_DIR = .
@@ -54,10 +54,10 @@ SRC += next_kbd.c
 
 # Search Path
 VPATH += $(TARGET_DIR)
-VPATH += $(TOP_DIR)
+VPATH += $(TMK_DIR)
 
 
-include $(TOP_DIR)/protocol.mk
-include $(TOP_DIR)/protocol/pjrc.mk
-include $(TOP_DIR)/common.mk
-include $(TOP_DIR)/rules.mk
+include $(TMK_DIR)/protocol.mk
+include $(TMK_DIR)/protocol/pjrc.mk
+include $(TMK_DIR)/common.mk
+include $(TMK_DIR)/rules.mk

diff --git a/converter/pc98_usb/Makefile b/converter/pc98_usb/Makefile
index 71c7858f37843617e1f88f8d70ab9a2ec11f1461..56738b34b2a47d8d0c1297d82b701d5400f87880 100644 (file)
--- a/converter/pc98_usb/Makefile
+++ b/converter/pc98_usb/Makefile
@@ -2,7 +2,7 @@
 TARGET = pc98_usb
 
 # Directory common source filess exist
-TOP_DIR = ../..
+TMK_DIR = ../..
 
 # Directory keyboard dependent files exist
 TARGET_DIR = .
@@ -74,10 +74,10 @@ OPT_DEFS += -DBOOTLOADER_SIZE=4096
 
 # Search Path
 VPATH += $(TARGET_DIR)
-VPATH += $(TOP_DIR)
+VPATH += $(TMK_DIR)
 
 
-include $(TOP_DIR)/protocol/lufa.mk
-include $(TOP_DIR)/protocol.mk
-include $(TOP_DIR)/common.mk
-include $(TOP_DIR)/rules.mk
+include $(TMK_DIR)/protocol/lufa.mk
+include $(TMK_DIR)/protocol.mk
+include $(TMK_DIR)/common.mk
+include $(TMK_DIR)/rules.mk

diff --git a/converter/ps2_usb/Makefile b/converter/ps2_usb/Makefile
index 1dd23c157e1f32ee652b1d2f9e357d7071a45a06..39455defdf5cb7d7930025134a0011edcf11930a 100644 (file)
--- a/converter/ps2_usb/Makefile
+++ b/converter/ps2_usb/Makefile
@@ -5,7 +5,7 @@
 TARGET = ps2_usb_lufa
 
 # Directory common source filess exist
-TOP_DIR = ../..
+TMK_DIR = ../..
 
 # Directory keyboard dependent files exist
 TARGET_DIR = .
@@ -97,9 +97,9 @@ PS2_USE_USART = yes   # uses hardware USART engine for PS/2 signal receive(recomen
 
 # Search Path
 VPATH += $(TARGET_DIR)
-VPATH += $(TOP_DIR)
+VPATH += $(TMK_DIR)
 
-include $(TOP_DIR)/protocol.mk
-include $(TOP_DIR)/protocol/lufa.mk
-include $(TOP_DIR)/common.mk
-include $(TOP_DIR)/rules.mk
+include $(TMK_DIR)/protocol.mk
+include $(TMK_DIR)/protocol/lufa.mk
+include $(TMK_DIR)/common.mk
+include $(TMK_DIR)/rules.mk

diff --git a/converter/ps2_usb/Makefile.pjrc b/converter/ps2_usb/Makefile.pjrc
index 0e175f8b451d8358c64907f216ca6e81c892a992..2aa2a8dc3bb959de274d03cb74c39dacf66809ea 100644 (file)
--- a/converter/ps2_usb/Makefile.pjrc
+++ b/converter/ps2_usb/Makefile.pjrc
@@ -2,7 +2,7 @@
 TARGET = ps2_usb_pjrc
 
 # Directory common source filess exist
-TOP_DIR = ../..
+TMK_DIR = ../..
 
 # Directory keyboard dependent files exist
 TARGET_DIR = .
@@ -66,10 +66,10 @@ PS2_USE_BUSYWAIT = yes      # uses primitive reference code
 
 # Search Path
 VPATH += $(TARGET_DIR)
-VPATH += $(TOP_DIR)
+VPATH += $(TMK_DIR)
 
 
-include $(TOP_DIR)/protocol.mk
-include $(TOP_DIR)/protocol/pjrc.mk
-include $(TOP_DIR)/common.mk
-include $(TOP_DIR)/rules.mk
+include $(TMK_DIR)/protocol.mk
+include $(TMK_DIR)/protocol/pjrc.mk
+include $(TMK_DIR)/common.mk
+include $(TMK_DIR)/rules.mk

diff --git a/converter/ps2_usb/Makefile.tmk_rev1 b/converter/ps2_usb/Makefile.tmk_rev1
index 59c44f75fcd465860164f5a04a5836797d954f5f..8b227c2f640c78efa73018321f8acdbb43648bf4 100644 (file)
--- a/converter/ps2_usb/Makefile.tmk_rev1
+++ b/converter/ps2_usb/Makefile.tmk_rev1
@@ -6,7 +6,7 @@
 TARGET = ps2_usb_tmk_rev1
 
 # Directory common source filess exist
-TOP_DIR = ../..
+TMK_DIR = ../..
 
 # Directory keyboard dependent files exist
 TARGET_DIR = .
@@ -90,9 +90,9 @@ PS2_USE_USART = yes   # uses hardware USART engine for PS/2 signal receive(recomen
 
 # Search Path
 VPATH += $(TARGET_DIR)
-VPATH += $(TOP_DIR)
+VPATH += $(TMK_DIR)
 
-include $(TOP_DIR)/protocol.mk
-include $(TOP_DIR)/protocol/lufa.mk
-include $(TOP_DIR)/common.mk
-include $(TOP_DIR)/rules.mk
+include $(TMK_DIR)/protocol.mk
+include $(TMK_DIR)/protocol/lufa.mk
+include $(TMK_DIR)/common.mk
+include $(TMK_DIR)/rules.mk

diff --git a/converter/ps2_usb/Makefile.tmk_rev2 b/converter/ps2_usb/Makefile.tmk_rev2
index bad958c36bea99e6706d1844a7a203e0966fb339..93e22661518ad676bc64e86f7d8fe58922b9c601 100644 (file)
--- a/converter/ps2_usb/Makefile.tmk_rev2
+++ b/converter/ps2_usb/Makefile.tmk_rev2
@@ -6,7 +6,7 @@
 TARGET = ps2_usb_tmk_rev2
 
 # Directory common source filess exist
-TOP_DIR = ../..
+TMK_DIR = ../..
 
 # Directory keyboard dependent files exist
 TARGET_DIR = .
@@ -90,9 +90,9 @@ PS2_USE_INT = yes     # uses external interrupt for falling edge of PS/2 clock pin
 
 # Search Path
 VPATH += $(TARGET_DIR)
-VPATH += $(TOP_DIR)
+VPATH += $(TMK_DIR)
 
-include $(TOP_DIR)/protocol.mk
-include $(TOP_DIR)/protocol/lufa.mk
-include $(TOP_DIR)/common.mk
-include $(TOP_DIR)/rules.mk
+include $(TMK_DIR)/protocol.mk
+include $(TMK_DIR)/protocol/lufa.mk
+include $(TMK_DIR)/common.mk
+include $(TMK_DIR)/rules.mk

diff --git a/converter/ps2_usb/Makefile.vusb b/converter/ps2_usb/Makefile.vusb
index ddf186845949d997322028b3c4423314914c0f44..facee690561cd82ae4bcc0e0d7497c15330461f2 100644 (file)
--- a/converter/ps2_usb/Makefile.vusb
+++ b/converter/ps2_usb/Makefile.vusb
@@ -2,7 +2,7 @@
 TARGET = ps2_usb_vusb
 
 # Directory common source filess exist
-TOP_DIR = ../..
+TMK_DIR = ../..
 
 # Directory keyboard dependent files exist
 TARGET_DIR = .
@@ -98,10 +98,10 @@ OPT_DEFS += -DBOOTLOADER_SIZE=2048
 
 # Search Path
 VPATH += $(TARGET_DIR)
-VPATH += $(TOP_DIR)
+VPATH += $(TMK_DIR)
 
 
-include $(TOP_DIR)/protocol.mk
-include $(TOP_DIR)/common.mk
-include $(TOP_DIR)/protocol/vusb.mk
-include $(TOP_DIR)/rules.mk
+include $(TMK_DIR)/protocol.mk
+include $(TMK_DIR)/common.mk
+include $(TMK_DIR)/protocol/vusb.mk
+include $(TMK_DIR)/rules.mk

diff --git a/converter/serialmouse_usb/Makefile b/converter/serialmouse_usb/Makefile
index ea0e439bd7b40b2807997012f509251257a3a057..87b5aacbba254f2fca9713359b32a1879b09db9e 100644 (file)
--- a/converter/serialmouse_usb/Makefile
+++ b/converter/serialmouse_usb/Makefile
@@ -5,7 +5,7 @@
 TARGET = serialmouse_usb
 
 # Directory common source filess exist
-TOP_DIR = ../..
+TMK_DIR = ../..
 
 # Directory keyboard dependent files exist
 TARGET_DIR = .
@@ -98,9 +98,9 @@ SERIAL_MOUSE_USE_SOFT = yes           # use software serial implementation
 
 # Search Path
 VPATH += $(TARGET_DIR)
-VPATH += $(TOP_DIR)
+VPATH += $(TMK_DIR)
 
-include $(TOP_DIR)/protocol.mk
-include $(TOP_DIR)/protocol/lufa.mk
-include $(TOP_DIR)/common.mk
-include $(TOP_DIR)/rules.mk
+include $(TMK_DIR)/protocol.mk
+include $(TMK_DIR)/protocol/lufa.mk
+include $(TMK_DIR)/common.mk
+include $(TMK_DIR)/rules.mk

diff --git a/converter/sun_usb/Makefile b/converter/sun_usb/Makefile
index b32497cd95db6f6829ef53a12dfe4291dacc8b6d..19e188100cd501810178c042b0d124ab2307e2b2 100644 (file)
--- a/converter/sun_usb/Makefile
+++ b/converter/sun_usb/Makefile
@@ -2,7 +2,7 @@
 TARGET = sun_usb
 
 # Directory common source filess exist
-TOP_DIR = ../..
+TMK_DIR = ../..
 
 # Directory keyboard dependent files exist
 TARGET_DIR = .
@@ -76,10 +76,10 @@ OPT_DEFS += -DBOOTLOADER_SIZE=4096
 
 # Search Path
 VPATH += $(TARGET_DIR)
-VPATH += $(TOP_DIR)
+VPATH += $(TMK_DIR)
 
 
-include $(TOP_DIR)/protocol/lufa.mk
-include $(TOP_DIR)/protocol.mk
-include $(TOP_DIR)/common.mk
-include $(TOP_DIR)/rules.mk
+include $(TMK_DIR)/protocol/lufa.mk
+include $(TMK_DIR)/protocol.mk
+include $(TMK_DIR)/common.mk
+include $(TMK_DIR)/rules.mk

diff --git a/converter/terminal_bluefruit/Makefile b/converter/terminal_bluefruit/Makefile
index 28b7397bae27eefb58d92befd5efa55cd4185346..d28cbf00890305a14d2ec9c2989451cc72012eba 100644 (file)
--- a/converter/terminal_bluefruit/Makefile
+++ b/converter/terminal_bluefruit/Makefile
@@ -2,7 +2,7 @@
 TARGET = terminal_bluefruit
 
 # Directory common source filess exist
-TOP_DIR = ../..
+TMK_DIR = ../..
 
 # Directory keyboard dependent files exist
 TARGET_DIR = .
@@ -89,11 +89,11 @@ PROGRAM_CMD = teensy_loader_cli -mmcu=$(MCU) -w -v $(TARGET).hex
 
 # Search Path
 VPATH += $(TARGET_DIR)
-VPATH += $(TOP_DIR)
+VPATH += $(TMK_DIR)
 
 
-include $(TOP_DIR)/protocol.mk
-include $(TOP_DIR)/protocol/bluefruit.mk
-include $(TOP_DIR)/protocol.mk
-include $(TOP_DIR)/common.mk
-include $(TOP_DIR)/rules.mk
+include $(TMK_DIR)/protocol.mk
+include $(TMK_DIR)/protocol/bluefruit.mk
+include $(TMK_DIR)/protocol.mk
+include $(TMK_DIR)/common.mk
+include $(TMK_DIR)/rules.mk

diff --git a/converter/terminal_usb/Makefile b/converter/terminal_usb/Makefile
index 16df638b94a4442dea6f4c013e4f05ee51d2c47a..de0710f7c4cda17af8f1f8446a2068ca2076bf84 100644 (file)
--- a/converter/terminal_usb/Makefile
+++ b/converter/terminal_usb/Makefile
@@ -2,7 +2,7 @@
 TARGET = terminal_lufa
 
 # Directory common source filess exist
-TOP_DIR = ../..
+TMK_DIR = ../..
 
 # Directory keyboard dependent files exist
 TARGET_DIR = .
@@ -89,10 +89,10 @@ PROGRAM_CMD = teensy_loader_cli -mmcu=$(MCU) -w -v $(TARGET).hex
 
 # Search Path
 VPATH += $(TARGET_DIR)
-VPATH += $(TOP_DIR)
+VPATH += $(TMK_DIR)
 
 
-include $(TOP_DIR)/protocol/lufa.mk
-include $(TOP_DIR)/protocol.mk
-include $(TOP_DIR)/common.mk
-include $(TOP_DIR)/rules.mk
+include $(TMK_DIR)/protocol/lufa.mk
+include $(TMK_DIR)/protocol.mk
+include $(TMK_DIR)/common.mk
+include $(TMK_DIR)/rules.mk

diff --git a/converter/usb_usb/Makefile b/converter/usb_usb/Makefile
index d6867bb002644348a74188eb82d86be225cd1e77..a1ceaaa4e6e392b6c841c1def788c651e41b49a9 100644 (file)
--- a/converter/usb_usb/Makefile
+++ b/converter/usb_usb/Makefile
@@ -41,7 +41,7 @@
 # Target file name (without extension).
 TARGET = usb_usb
 
-TOP_DIR = ../..
+TMK_DIR = ../..
 
 # Directory keyboard dependent files exist
 TARGET_DIR = .
@@ -121,7 +121,7 @@ CONFIG_H = config.h
 
 # Search Path
 VPATH += $(TARGET_DIR)
-VPATH += $(TOP_DIR)
+VPATH += $(TMK_DIR)
 
 
 
@@ -130,7 +130,7 @@ PROGRAM_CMD = avrdude -p$(MCU) -cavr109 -b57600 -Uflash:w:$(TARGET).hex -P$(DEV)
 
 
 
-include $(TOP_DIR)/protocol/usb_hid.mk
-include $(TOP_DIR)/protocol/lufa.mk
-include $(TOP_DIR)/common.mk
-include $(TOP_DIR)/rules.mk
+include $(TMK_DIR)/protocol/usb_hid.mk
+include $(TMK_DIR)/protocol/lufa.mk
+include $(TMK_DIR)/common.mk
+include $(TMK_DIR)/rules.mk

diff --git a/converter/x68k_usb/Makefile b/converter/x68k_usb/Makefile
index 948622c7c8697a2b407ec380f6bc305b3325c378..a34e1c79ff4e6027db035a5f9560bb9f8a9463b5 100644 (file)
--- a/converter/x68k_usb/Makefile
+++ b/converter/x68k_usb/Makefile
@@ -7,7 +7,7 @@
 TARGET = x68k_usb_pjrc
 
 # Directory common source filess exist
-TOP_DIR = ../..
+TMK_DIR = ../..
 
 # Directory keyboard dependent files exist
 TARGET_DIR = .
@@ -92,10 +92,10 @@ PROGRAM_CMD = dfu-programmer atmega32u4 flash $(TARGET).hex
 
 # Search Path
 VPATH += $(TARGET_DIR)
-VPATH += $(TOP_DIR)
+VPATH += $(TMK_DIR)
 
 
-include $(TOP_DIR)/protocol/pjrc.mk
-include $(TOP_DIR)/protocol.mk
-include $(TOP_DIR)/common.mk
-include $(TOP_DIR)/rules.mk
+include $(TMK_DIR)/protocol/pjrc.mk
+include $(TMK_DIR)/protocol.mk
+include $(TMK_DIR)/common.mk
+include $(TMK_DIR)/rules.mk

diff --git a/keyboard/IIgs/Makefile b/keyboard/IIgs/Makefile
index c18e9720c7534da819e5eb98d227ee13cd6dccf6..938877c3d0b601c5b4b6d6f66a2b7352817c958a 100644 (file)
--- a/keyboard/IIgs/Makefile
+++ b/keyboard/IIgs/Makefile
@@ -42,7 +42,7 @@
 TARGET = IIgs_Standard
 
 # Directory common source filess exist
-TOP_DIR = ../..
+TMK_DIR = ../..
 
 # Directory keyboard dependent files exist
 TARGET_DIR = .
@@ -88,8 +88,8 @@ PROGRAM_CMD = teensy_loader_cli -mmcu=$(MCU) -w -v $(TARGET).hex
 
 # Search Path
 VPATH += $(TARGET_DIR)
-VPATH += $(TOP_DIR)
+VPATH += $(TMK_DIR)
 
-include $(TOP_DIR)/protocol/pjrc.mk
-include $(TOP_DIR)/common.mk
-include $(TOP_DIR)/rules.mk
+include $(TMK_DIR)/protocol/pjrc.mk
+include $(TMK_DIR)/common.mk
+include $(TMK_DIR)/rules.mk

diff --git a/keyboard/alps64/Makefile b/keyboard/alps64/Makefile
index a7d59309e828748f7dd3d7c9a66adf35cbd01931..3e0dccc9e9814a2ea9b0595238a3d0960ac6ac33 100644 (file)
--- a/keyboard/alps64/Makefile
+++ b/keyboard/alps64/Makefile
@@ -42,7 +42,7 @@
 TARGET = alps64
 
 # Directory common source filess exist
-TOP_DIR = ../..
+TMK_DIR = ../..
 
 # Directory keyboard dependent files exist
 TARGET_DIR = .
@@ -127,8 +127,8 @@ COMMAND_ENABLE = yes    # Commands for debug and configuration
 
 # Search Path
 VPATH += $(TARGET_DIR)
-VPATH += $(TOP_DIR)
+VPATH += $(TMK_DIR)
 
-include $(TOP_DIR)/protocol/lufa.mk
-include $(TOP_DIR)/common.mk
-include $(TOP_DIR)/rules.mk
+include $(TMK_DIR)/protocol/lufa.mk
+include $(TMK_DIR)/common.mk
+include $(TMK_DIR)/rules.mk

diff --git a/keyboard/gh60/Makefile b/keyboard/gh60/Makefile
index fd202c1792b781648bcfdf988020a8bca4338195..347847f778919a362245e255f51d78a35d4846ae 100644 (file)
--- a/keyboard/gh60/Makefile
+++ b/keyboard/gh60/Makefile
@@ -42,7 +42,7 @@
 TARGET = gh60_lufa
 
 # Directory common source filess exist
-TOP_DIR = ../..
+TMK_DIR = ../..
 
 # Directory keyboard dependent files exist
 TARGET_DIR = .
@@ -128,8 +128,8 @@ NKRO_ENABLE = yes   # USB Nkey Rollover - not yet supported in LUFA
 
 # Search Path
 VPATH += $(TARGET_DIR)
-VPATH += $(TOP_DIR)
+VPATH += $(TMK_DIR)
 
-include $(TOP_DIR)/protocol/lufa.mk
-include $(TOP_DIR)/common.mk
-include $(TOP_DIR)/rules.mk
+include $(TMK_DIR)/protocol/lufa.mk
+include $(TMK_DIR)/common.mk
+include $(TMK_DIR)/rules.mk

diff --git a/keyboard/gh60/Makefile.pjrc b/keyboard/gh60/Makefile.pjrc
index 9655ff65a99ad54df7d68f4ace81769fac88c2cf..291579e64f82165862f3a1f416b359d14bc09e34 100644 (file)
--- a/keyboard/gh60/Makefile.pjrc
+++ b/keyboard/gh60/Makefile.pjrc
@@ -42,7 +42,7 @@
 TARGET = gh60_pjrc
 
 # Directory common source filess exist
-TOP_DIR = ../..
+TMK_DIR = ../..
 
 # Directory keyboard dependent files exist
 TARGET_DIR = .
@@ -97,11 +97,11 @@ NKRO_ENABLE = yes   # USB Nkey Rollover(+500)
 
 # Search Path
 VPATH += $(TARGET_DIR)
-VPATH += $(TOP_DIR)
+VPATH += $(TMK_DIR)
 
-include $(TOP_DIR)/protocol/pjrc.mk
-include $(TOP_DIR)/common.mk
-include $(TOP_DIR)/rules.mk
+include $(TMK_DIR)/protocol/pjrc.mk
+include $(TMK_DIR)/common.mk
+include $(TMK_DIR)/rules.mk
 
 plain: OPT_DEFS += -DKEYMAP_PLAIN
 plain: all

diff --git a/keyboard/ghost_squid/Makefile.lufa b/keyboard/ghost_squid/Makefile.lufa
index 61893893a43031500460be34cc03082705adaf1c..cfd7e8ecfad69a498fe1653262caec91ffbbec8e 100644 (file)
--- a/keyboard/ghost_squid/Makefile.lufa
+++ b/keyboard/ghost_squid/Makefile.lufa
@@ -42,7 +42,7 @@
 TARGET = ghostsquid_lufa
 
 # Directory common source filess exist
-TOP_DIR = ../..
+TMK_DIR = ../..
 
 # Directory keyboard dependent files exist
 TARGET_DIR = .
@@ -110,8 +110,8 @@ OPT_DEFS += -DBOOTLOADER_SIZE=4096
 
 # Search Path
 VPATH += $(TARGET_DIR)
-VPATH += $(TOP_DIR)
+VPATH += $(TMK_DIR)
 
-include $(TOP_DIR)/protocol/lufa.mk
-include $(TOP_DIR)/common.mk
-include $(TOP_DIR)/rules.mk
+include $(TMK_DIR)/protocol/lufa.mk
+include $(TMK_DIR)/common.mk
+include $(TMK_DIR)/rules.mk

diff --git a/keyboard/hbkb/Makefile.lufa b/keyboard/hbkb/Makefile.lufa
index 0d103c87666b37056c36e19f36aaf8d7b5280212..47101ec0967d8d3c088c1d2a134a5b952fb4ee62 100644 (file)
--- a/keyboard/hbkb/Makefile.lufa
+++ b/keyboard/hbkb/Makefile.lufa
@@ -42,7 +42,7 @@
 TARGET = hbkb_lufa
 
 # Directory common source filess exist
-TOP_DIR = ../..
+TMK_DIR = ../..
 
 # Directory keyboard dependent files exist
 TARGET_DIR = .
@@ -113,8 +113,8 @@ OPT_DEFS += -DBOOTLOADER_SIZE=4096
 
 # Search Path
 VPATH += $(TARGET_DIR)
-VPATH += $(TOP_DIR)
+VPATH += $(TMK_DIR)
 
-include $(TOP_DIR)/protocol/lufa.mk
-include $(TOP_DIR)/common.mk
-include $(TOP_DIR)/rules.mk
+include $(TMK_DIR)/protocol/lufa.mk
+include $(TMK_DIR)/common.mk
+include $(TMK_DIR)/rules.mk

diff --git a/keyboard/hhkb/Makefile b/keyboard/hhkb/Makefile
index dc5c06a948193f92afb1a04dcce9dc7ad25782c8..ea5a65ea29cab433b39f62eb4251248bf601b483 100644 (file)
--- a/keyboard/hhkb/Makefile
+++ b/keyboard/hhkb/Makefile
@@ -42,7 +42,7 @@
 TARGET = hhkb_lufa
 
 # Directory common source filess exist
-TOP_DIR = ../..
+TMK_DIR = ../..
 
 # Directory keyboard dependent files exist
 TARGET_DIR = .
@@ -142,11 +142,11 @@ endif
 
 # Search Path
 VPATH += $(TARGET_DIR)
-VPATH += $(TOP_DIR)
+VPATH += $(TMK_DIR)
 
-include $(TOP_DIR)/protocol/lufa.mk
-include $(TOP_DIR)/common.mk
-include $(TOP_DIR)/rules.mk
+include $(TMK_DIR)/protocol/lufa.mk
+include $(TMK_DIR)/common.mk
+include $(TMK_DIR)/rules.mk
 
 debug-on: EXTRAFLAGS += -DDEBUG -DDEBUG_ACTION
 debug-on: all

diff --git a/keyboard/hhkb/Makefile.pjrc b/keyboard/hhkb/Makefile.pjrc
index b6ce9c7504e9ae632e9d6d5733b0acf9e41c3ef1..53bb784cf03ca459ed08166ec0aa5888fff25cdf 100644 (file)
--- a/keyboard/hhkb/Makefile.pjrc
+++ b/keyboard/hhkb/Makefile.pjrc
@@ -7,7 +7,7 @@
 TARGET = hhkb_pjrc
 
 # Directory common source filess exist
-TOP_DIR = ../..
+TMK_DIR = ../..
 
 # Directory keyboard dependent files exist
 TARGET_DIR = .
@@ -61,8 +61,8 @@ PROGRAM_CMD = teensy_loader_cli -mmcu=$(MCU) -w -v $(TARGET).hex
 
 # Search Path
 VPATH += $(TARGET_DIR)
-VPATH += $(TOP_DIR)
+VPATH += $(TMK_DIR)
 
-include $(TOP_DIR)/protocol/pjrc.mk
-include $(TOP_DIR)/common.mk
-include $(TOP_DIR)/rules.mk
+include $(TMK_DIR)/protocol/pjrc.mk
+include $(TMK_DIR)/common.mk
+include $(TMK_DIR)/rules.mk

diff --git a/keyboard/hhkb/Makefile.rn42 b/keyboard/hhkb/Makefile.rn42
index b1eacd070ff5c1052db299796a4441f79c122deb..66bdba9174d6ea51433ceb947426a5ef5cb0dfaa 100644 (file)
--- a/keyboard/hhkb/Makefile.rn42
+++ b/keyboard/hhkb/Makefile.rn42
@@ -42,7 +42,7 @@
 TARGET = hhkb_rn42
 
 # Directory common source filess exist
-TOP_DIR = ../..
+TMK_DIR = ../..
 
 # Directory keyboard dependent files exist
 TARGET_DIR = .
@@ -139,13 +139,13 @@ endif
 
 # Search Path
 VPATH += $(TARGET_DIR)
-VPATH += $(TOP_DIR)
+VPATH += $(TMK_DIR)
 
 include rn42.mk
-include $(TOP_DIR)/protocol.mk
-include $(TOP_DIR)/protocol/lufa.mk
-include $(TOP_DIR)/common.mk
-include $(TOP_DIR)/rules.mk
+include $(TMK_DIR)/protocol.mk
+include $(TMK_DIR)/protocol/lufa.mk
+include $(TMK_DIR)/common.mk
+include $(TMK_DIR)/rules.mk
 
 debug-on: EXTRAFLAGS += -DDEBUG -DDEBUG_ACTION
 debug-on: all

diff --git a/keyboard/hhkb/not_supported/Makefile.iwrap b/keyboard/hhkb/not_supported/Makefile.iwrap
index 2d9d82c48115840eb7a90894f32369eacbcd07ba..5bc94d5f6d09d5660703051eb15dad9e3a838bdc 100644 (file)
--- a/keyboard/hhkb/not_supported/Makefile.iwrap
+++ b/keyboard/hhkb/not_supported/Makefile.iwrap
@@ -7,7 +7,7 @@
 TARGET = hhkb_iwrap
 
 # Directory common source filess exist
-TOP_DIR = ../..
+TMK_DIR = ../..
 
 # Directory keyboard dependent files exist
 TARGET_DIR = .
@@ -94,10 +94,10 @@ PROGRAM_CMD = $(AVRDUDE) $(AVRDUDE_FLAGS) $(AVRDUDE_WRITE_FLASH) $(AVRDUDE_WRITE
 
 # Search Path
 VPATH += $(TARGET_DIR)
-VPATH += $(TOP_DIR)
+VPATH += $(TMK_DIR)
 
-include $(TOP_DIR)/protocol/iwrap.mk
+include $(TMK_DIR)/protocol/iwrap.mk
 # TODO: to be selectable: V-USB, LUFA or PJRC
-#include $(TOP_DIR)/protocol/vusb.mk
-include $(TOP_DIR)/common.mk
-include $(TOP_DIR)/rules.mk
+#include $(TMK_DIR)/protocol/vusb.mk
+include $(TMK_DIR)/common.mk
+include $(TMK_DIR)/rules.mk

diff --git a/keyboard/hhkb/not_supported/Makefile.vusb b/keyboard/hhkb/not_supported/Makefile.vusb
index 4343b210d90304d9797b5e35beffde50695b420a..61fd9288964192706c1a4279cb3f2f253e65c6a1 100644 (file)
--- a/keyboard/hhkb/not_supported/Makefile.vusb
+++ b/keyboard/hhkb/not_supported/Makefile.vusb
@@ -7,7 +7,7 @@
 TARGET = hhkb_vusb
 
 # Directory common source filess exist
-TOP_DIR = ../..
+TMK_DIR = ../..
 
 # Directory keyboard dependent files exist
 TARGET_DIR = .
@@ -87,11 +87,11 @@ PROGRAM_CMD = $(AVRDUDE) $(AVRDUDE_FLAGS) $(AVRDUDE_WRITE_FLASH) $(AVRDUDE_WRITE
 
 # Search Path
 VPATH += $(TARGET_DIR)
-VPATH += $(TOP_DIR)
+VPATH += $(TMK_DIR)
 
-include $(TOP_DIR)/protocol/vusb.mk
-include $(TOP_DIR)/common.mk
-include $(TOP_DIR)/rules.mk
+include $(TMK_DIR)/protocol/vusb.mk
+include $(TMK_DIR)/common.mk
+include $(TMK_DIR)/rules.mk
 
 debug-on: EXTRAFLAGS += -DDEBUG
 debug-on: all

diff --git a/keyboard/hid_liber/Makefile.lufa b/keyboard/hid_liber/Makefile.lufa
index c99d1a32f6f143410dad4771b248bfc63c02dfe5..89c2d6fdf70fde24392c1b1fefdc23970607473d 100644 (file)
--- a/keyboard/hid_liber/Makefile.lufa
+++ b/keyboard/hid_liber/Makefile.lufa
@@ -42,7 +42,7 @@
 TARGET = hid_liber_lufa
 
 # Directory common source filess exist
-TOP_DIR = ../..
+TMK_DIR = ../..
 
 # Directory keyboard dependent files exist
 TARGET_DIR = .
@@ -119,11 +119,11 @@ COMMAND_ENABLE = yes        # Commands for debug and configuration
 
 # Search Path
 VPATH += $(TARGET_DIR)
-VPATH += $(TOP_DIR)
+VPATH += $(TMK_DIR)
 
-include $(TOP_DIR)/protocol/lufa.mk
-include $(TOP_DIR)/common.mk
-include $(TOP_DIR)/rules.mk
+include $(TMK_DIR)/protocol/lufa.mk
+include $(TMK_DIR)/common.mk
+include $(TMK_DIR)/rules.mk
 
 ansi: OPT_DEFS += -DLAYOUT_ANSI
 ansi: all

diff --git a/keyboard/hid_liber/Makefile.pjrc b/keyboard/hid_liber/Makefile.pjrc
index 42fb6895e1ee6cbbb81ef211409decebeaa68788..63d1fef72cd66e353e0b29ab22f5ad04116d2708 100644 (file)
--- a/keyboard/hid_liber/Makefile.pjrc
+++ b/keyboard/hid_liber/Makefile.pjrc
@@ -42,7 +42,7 @@
 TARGET = hid_liber_pjrc
 
 # Directory common source filess exist
-TOP_DIR = ../..
+TMK_DIR = ../..
 
 # Directory keyboard dependent files exist
 TARGET_DIR = .
@@ -92,11 +92,11 @@ NKRO_ENABLE = yes           # USB Nkey Rollover - not yet supported in LUFA
 
 # Search Path
 VPATH += $(TARGET_DIR)
-VPATH += $(TOP_DIR)
+VPATH += $(TMK_DIR)
 
-include $(TOP_DIR)/protocol/pjrc.mk
-include $(TOP_DIR)/common.mk
-include $(TOP_DIR)/rules.mk
+include $(TMK_DIR)/protocol/pjrc.mk
+include $(TMK_DIR)/common.mk
+include $(TMK_DIR)/rules.mk
 
 ansi: OPT_DEFS += -DLAYOUT_ANSI
 ansi: all

diff --git a/keyboard/kitten_paw/Makefile.lufa b/keyboard/kitten_paw/Makefile.lufa
index 4a643ea7900a8b0e73a005ff8778a294d6ff687c..d793d98697d7dea676c37ce27c12964973c8ff72 100644 (file)
--- a/keyboard/kitten_paw/Makefile.lufa
+++ b/keyboard/kitten_paw/Makefile.lufa
@@ -42,7 +42,7 @@
 TARGET = kittenpaw_lufa
 
 # Directory common source filess exist
-TOP_DIR = ../..
+TMK_DIR = ../..
 
 # Directory keyboard dependent files exist
 TARGET_DIR = .
@@ -110,8 +110,8 @@ OPT_DEFS += -DBOOTLOADER_SIZE=4096
 
 # Search Path
 VPATH += $(TARGET_DIR)
-VPATH += $(TOP_DIR)
+VPATH += $(TMK_DIR)
 
-include $(TOP_DIR)/protocol/lufa.mk
-include $(TOP_DIR)/common.mk
-include $(TOP_DIR)/rules.mk
+include $(TMK_DIR)/protocol/lufa.mk
+include $(TMK_DIR)/common.mk
+include $(TMK_DIR)/rules.mk

diff --git a/keyboard/kmac/Makefile.lufa b/keyboard/kmac/Makefile.lufa
index 09343d4bc4d607a3d3fda16f64a2da045ef5b3e2..fd0091aa313ec279ef64ac9942a5cf0593daf56a 100644 (file)
--- a/keyboard/kmac/Makefile.lufa
+++ b/keyboard/kmac/Makefile.lufa
@@ -42,7 +42,7 @@
 TARGET = kmac_lufa
 
 # Directory common source filess exist
-TOP_DIR = ../..
+TMK_DIR = ../..
 
 # Directory keyboard dependent files exist
 TARGET_DIR = .
@@ -117,11 +117,11 @@ OPT_DEFS += -DBOOTLOADER_SIZE=4096
 
 # Search Path
 VPATH += $(TARGET_DIR)
-VPATH += $(TOP_DIR)
+VPATH += $(TMK_DIR)
 
-include $(TOP_DIR)/protocol/lufa.mk
-include $(TOP_DIR)/common.mk
-include $(TOP_DIR)/rules.mk
+include $(TMK_DIR)/protocol/lufa.mk
+include $(TMK_DIR)/common.mk
+include $(TMK_DIR)/rules.mk
 
 winkey: OPT_DEFS += -DLAYOUT_WINKEY
 winkey: all

diff --git a/keyboard/kmac/Makefile.pjrc b/keyboard/kmac/Makefile.pjrc
index 22ee8de47af7a1a7b5702962336e4521dc51e483..61c9c1530480034a655abb7a844eb9baf4440331 100644 (file)
--- a/keyboard/kmac/Makefile.pjrc
+++ b/keyboard/kmac/Makefile.pjrc
@@ -42,7 +42,7 @@
 TARGET = kmac_pjrc
 
 # Directory common source filess exist
-TOP_DIR = ../..
+TMK_DIR = ../..
 
 # Directory keyboard dependent files exist
 TARGET_DIR = .
@@ -88,11 +88,11 @@ BACKLIGHT_ENABLE = yes  # Enable keyboard backlight functionality
 
 # Search Path
 VPATH += $(TARGET_DIR)
-VPATH += $(TOP_DIR)
+VPATH += $(TMK_DIR)
 
-include $(TOP_DIR)/protocol/pjrc.mk
-include $(TOP_DIR)/common.mk
-include $(TOP_DIR)/rules.mk
+include $(TMK_DIR)/protocol/pjrc.mk
+include $(TMK_DIR)/common.mk
+include $(TMK_DIR)/rules.mk
 
 winkey: OPT_DEFS += -DLAYOUT_WINKEY
 winkey: all

diff --git a/keyboard/lightpad/Makefile.lufa b/keyboard/lightpad/Makefile.lufa
index 7bce7ebffc895df632bf276acf0fb7944cd30b9b..b5240b2d5d6b6f048ff0d90ad7fd171d7ce4bd16 100644 (file)
--- a/keyboard/lightpad/Makefile.lufa
+++ b/keyboard/lightpad/Makefile.lufa
@@ -42,7 +42,7 @@
 TARGET = lightpad_lufa
 
 # Directory common source filess exist
-TOP_DIR = ../..
+TMK_DIR = ../..
 
 # Directory keyboard dependent files exist
 TARGET_DIR = .
@@ -110,8 +110,8 @@ OPT_DEFS += -DBOOTLOADER_SIZE=4096
 
 # Search Path
 VPATH += $(TARGET_DIR)
-VPATH += $(TOP_DIR)
+VPATH += $(TMK_DIR)
 
-include $(TOP_DIR)/protocol/lufa.mk
-include $(TOP_DIR)/common.mk
-include $(TOP_DIR)/rules.mk
+include $(TMK_DIR)/protocol/lufa.mk
+include $(TMK_DIR)/common.mk
+include $(TMK_DIR)/rules.mk

diff --git a/keyboard/lightsaber/Makefile.lufa b/keyboard/lightsaber/Makefile.lufa
index b430efd2297f603098a46bb3477292a88e559791..25cacacc4ec31d2521e5178d28105cfbf0075df3 100644 (file)
--- a/keyboard/lightsaber/Makefile.lufa
+++ b/keyboard/lightsaber/Makefile.lufa
@@ -42,7 +42,7 @@
 TARGET = lightsaber_lufa
 
 # Directory common source filess exist
-TOP_DIR = ../..
+TMK_DIR = ../..
 
 # Directory keyboard dependent files exist
 TARGET_DIR = .
@@ -116,11 +116,11 @@ OPT_DEFS += -DBOOTLOADER_SIZE=4096
 
 # Search Path
 VPATH += $(TARGET_DIR)
-VPATH += $(TOP_DIR)
+VPATH += $(TMK_DIR)
 
-include $(TOP_DIR)/protocol/lufa.mk
-include $(TOP_DIR)/common.mk
-include $(TOP_DIR)/rules.mk
+include $(TMK_DIR)/protocol/lufa.mk
+include $(TMK_DIR)/common.mk
+include $(TMK_DIR)/rules.mk
 
 winkey: OPT_DEFS += -DLAYOUT_WINKEY
 winkey: all

diff --git a/keyboard/lightsaber/Makefile.pjrc b/keyboard/lightsaber/Makefile.pjrc
index 58735a7ef0e7af230b1782fe823964bad0392553..e5dec297cdfd0b0b6aadc099c34e09d922d3e4ec 100644 (file)
--- a/keyboard/lightsaber/Makefile.pjrc
+++ b/keyboard/lightsaber/Makefile.pjrc
@@ -42,7 +42,7 @@
 TARGET = lightsaber_pjrc
 
 # Directory common source filess exist
-TOP_DIR = ../..
+TMK_DIR = ../..
 
 # Directory keyboard dependent files exist
 TARGET_DIR = .
@@ -84,11 +84,11 @@ BACKLIGHT_ENABLE = yes  # Enable keyboard backlight functionality
 
 # Search Path
 VPATH += $(TARGET_DIR)
-VPATH += $(TOP_DIR)
+VPATH += $(TMK_DIR)
 
-include $(TOP_DIR)/protocol/pjrc.mk
-include $(TOP_DIR)/common.mk
-include $(TOP_DIR)/rules.mk
+include $(TMK_DIR)/protocol/pjrc.mk
+include $(TMK_DIR)/common.mk
+include $(TMK_DIR)/rules.mk
 
 winkey: OPT_DEFS += -DLAYOUT_WINKEY
 winkey: all

diff --git a/keyboard/macway/Makefile.lufa b/keyboard/macway/Makefile.lufa
index 359a8c246d155b163e200a7cf2e5dacc1cd1978f..8f216e726ffac8be3f5c727c2944c22c96d6b914 100644 (file)
--- a/keyboard/macway/Makefile.lufa
+++ b/keyboard/macway/Makefile.lufa
@@ -42,7 +42,7 @@
 TARGET = macway_lufa
 
 # Directory common source filess exist
-TOP_DIR = ../..
+TMK_DIR = ../..
 
 # Directory keyboard dependent files exist
 TARGET_DIR = .
@@ -114,8 +114,8 @@ COMMAND_ENABLE = yes    # Commands for debug and configuration
 
 # Search Path
 VPATH += $(TARGET_DIR)
-VPATH += $(TOP_DIR)
+VPATH += $(TMK_DIR)
 
-include $(TOP_DIR)/protocol/lufa.mk
-include $(TOP_DIR)/common.mk
-include $(TOP_DIR)/rules.mk
+include $(TMK_DIR)/protocol/lufa.mk
+include $(TMK_DIR)/common.mk
+include $(TMK_DIR)/rules.mk

diff --git a/keyboard/macway/Makefile.pjrc b/keyboard/macway/Makefile.pjrc
index 9e84a34185eb60271144db25cf90f707946d1746..3d67b1b7d07041885beb6393b630255b1a5ba079 100644 (file)
--- a/keyboard/macway/Makefile.pjrc
+++ b/keyboard/macway/Makefile.pjrc
@@ -42,7 +42,7 @@
 TARGET = macway_pjrc
 
 # Directory common source filess exist
-TOP_DIR = ../..
+TMK_DIR = ../..
 
 # Directory keyboard dependent files exist
 TARGET_DIR = .
@@ -90,8 +90,8 @@ PROGRAM_CMD = teensy_loader_cli -mmcu=$(MCU) -w -v $(TARGET).hex
 
 # Search Path
 VPATH += $(TARGET_DIR)
-VPATH += $(TOP_DIR)
+VPATH += $(TMK_DIR)
 
-include $(TOP_DIR)/protocol/pjrc.mk
-include $(TOP_DIR)/common.mk
-include $(TOP_DIR)/rules.mk
+include $(TMK_DIR)/protocol/pjrc.mk
+include $(TMK_DIR)/common.mk
+include $(TMK_DIR)/rules.mk

diff --git a/keyboard/nerd/Makefile b/keyboard/nerd/Makefile
index 5fd382841ff2d27dfcc33d9695b3d0bb36752302..554fc8b3f8140c796b982dabe5eddd43257d4d19 100644 (file)
--- a/keyboard/nerd/Makefile
+++ b/keyboard/nerd/Makefile
@@ -42,7 +42,7 @@
 TARGET = nerd_lufa
 
 # Directory common source filess exist
-TOP_DIR = ../..
+TMK_DIR = ../..
 
 # Directory keyboard dependent files exist
 TARGET_DIR = .
@@ -119,8 +119,8 @@ BACKLIGHT_ENABLE = yes  # Enable keyboard backlight functionality
 
 # Search Path
 VPATH += $(TARGET_DIR)
-VPATH += $(TOP_DIR)
+VPATH += $(TMK_DIR)
 
-include $(TOP_DIR)/protocol/lufa.mk
-include $(TOP_DIR)/common.mk
-include $(TOP_DIR)/rules.mk
+include $(TMK_DIR)/protocol/lufa.mk
+include $(TMK_DIR)/common.mk
+include $(TMK_DIR)/rules.mk

diff --git a/keyboard/onekey/Makefile b/keyboard/onekey/Makefile
index 78732e470d225b40cf6311a4c9e133520d056bd2..54a2d486fdff81d5a160d456c9b4f4fc2b0946fe 100644 (file)
--- a/keyboard/onekey/Makefile
+++ b/keyboard/onekey/Makefile
@@ -42,7 +42,7 @@
 TARGET = onekey_lufa
 
 # Directory common source filess exist
-TOP_DIR = ../..
+TMK_DIR = ../..
 
 # Directory keyboard dependent files exist
 TARGET_DIR = .
@@ -124,9 +124,9 @@ CONSOLE_ENABLE = yes        # Console for debug(+400)
 
 # Search Path
 VPATH += $(TARGET_DIR)
-VPATH += $(TOP_DIR)
+VPATH += $(TMK_DIR)
 
-include $(TOP_DIR)/common.mk
-include $(TOP_DIR)/protocol.mk
-include $(TOP_DIR)/protocol/lufa.mk
-include $(TOP_DIR)/rules.mk
+include $(TMK_DIR)/common.mk
+include $(TMK_DIR)/protocol.mk
+include $(TMK_DIR)/protocol/lufa.mk
+include $(TMK_DIR)/rules.mk

diff --git a/keyboard/onekey/Makefile.pjrc b/keyboard/onekey/Makefile.pjrc
index 24ade3350593ebc4ef3ceff55f0424198032e878..e4ca0783ad6ca2e41b5be65f5c1fa5af9081eaa4 100644 (file)
--- a/keyboard/onekey/Makefile.pjrc
+++ b/keyboard/onekey/Makefile.pjrc
@@ -42,7 +42,7 @@
 TARGET = onekey_pjrc
 
 # Directory common source filess exist
-TOP_DIR = ../..
+TMK_DIR = ../..
 
 # Directory keyboard dependent files exist
 TARGET_DIR = .
@@ -95,9 +95,9 @@ PS2_USE_BUSYWAIT = yes # uses primitive reference code
 
 # Search Path
 VPATH += $(TARGET_DIR)
-VPATH += $(TOP_DIR)
+VPATH += $(TMK_DIR)
 
-include $(TOP_DIR)/common.mk
-include $(TOP_DIR)/protocol.mk
-include $(TOP_DIR)/protocol/pjrc.mk
-include $(TOP_DIR)/rules.mk
+include $(TMK_DIR)/common.mk
+include $(TMK_DIR)/protocol.mk
+include $(TMK_DIR)/protocol/pjrc.mk
+include $(TMK_DIR)/rules.mk

diff --git a/keyboard/phantom/Makefile.lufa b/keyboard/phantom/Makefile.lufa
index 97756de0a1d099ab60a30b9bf2f58cdc1db96c63..55d155b158ed2b12ded759b22a006ee69ce5ebd7 100644 (file)
--- a/keyboard/phantom/Makefile.lufa
+++ b/keyboard/phantom/Makefile.lufa
@@ -42,7 +42,7 @@
 TARGET = phantom_lufa
 
 # Directory common source filess exist
-TOP_DIR = ../..
+TMK_DIR = ../..
 
 # Directory keyboard dependent files exist
 TARGET_DIR = .
@@ -115,11 +115,11 @@ OPT_DEFS += -DBOOTLOADER_SIZE=512
 
 # Search Path
 VPATH += $(TARGET_DIR)
-VPATH += $(TOP_DIR)
+VPATH += $(TMK_DIR)
 
-include $(TOP_DIR)/protocol/lufa.mk
-include $(TOP_DIR)/common.mk
-include $(TOP_DIR)/rules.mk
+include $(TMK_DIR)/protocol/lufa.mk
+include $(TMK_DIR)/common.mk
+include $(TMK_DIR)/rules.mk
 
 ansi: OPT_DEFS += -DLAYOUT_ANSI
 ansi: all

diff --git a/keyboard/phantom/Makefile.pjrc b/keyboard/phantom/Makefile.pjrc
index aa01ac5ab29504e81641ac4bcbda609f210eb8e6..bc57af6a581e33b81040819a8e5b91627685fd67 100644 (file)
--- a/keyboard/phantom/Makefile.pjrc
+++ b/keyboard/phantom/Makefile.pjrc
@@ -42,7 +42,7 @@
 TARGET = phantom_pjrc
 
 # Directory common source filess exist
-TOP_DIR = ../..
+TMK_DIR = ../..
 
 # Directory keyboard dependent files exist
 TARGET_DIR = .
@@ -86,11 +86,11 @@ COMMAND_ENABLE = yes    # Commands for debug and configuration
 
 # Search Path
 VPATH += $(TARGET_DIR)
-VPATH += $(TOP_DIR)
+VPATH += $(TMK_DIR)
 
-include $(TOP_DIR)/protocol/pjrc.mk
-include $(TOP_DIR)/common.mk
-include $(TOP_DIR)/rules.mk
+include $(TMK_DIR)/protocol/pjrc.mk
+include $(TMK_DIR)/common.mk
+include $(TMK_DIR)/rules.mk
 
 ansi: OPT_DEFS += -DLAYOUT_ANSI
 ansi: all

diff --git a/protocol.mk b/protocol.mk
index d9194b2bfc0d731f5b0f417772a9bbee1fe84679..726f658a0422df5ab9096469aaa1f5a240a4d57b 100644 (file)
--- a/protocol.mk
+++ b/protocol.mk
@@ -47,4 +47,4 @@ ifdef SERIAL_MOUSE_USE_UART
 endif
 
 # Search Path
-VPATH += $(TOP_DIR)/protocol
+VPATH += $(TMK_DIR)/protocol

diff --git a/protocol/bluefruit.mk b/protocol/bluefruit.mk
index 7e6328f6cb9d4beb05fe25b51a68356ee4c48d26..e1c5fff77ffa074c8244ec6fa0b7a3d6f31234a5 100644 (file)
--- a/protocol/bluefruit.mk
+++ b/protocol/bluefruit.mk
@@ -19,9 +19,9 @@ ifdef EXTRAKEY_ENABLE
 endif
 
 # Search Path
-VPATH += $(TOP_DIR)/$(BLUEFRUIT_DIR)
-#VPATH += $(TOP_DIR)/$(BLUEFRUIT_DIR)/usb_debug_only
-VPATH += $(TOP_DIR)/$(PJRC_DIR)
+VPATH += $(TMK_DIR)/$(BLUEFRUIT_DIR)
+#VPATH += $(TMK_DIR)/$(BLUEFRUIT_DIR)/usb_debug_only
+VPATH += $(TMK_DIR)/$(PJRC_DIR)
 
 OPT_DEFS += -DPROTOCOL_BLUEFRUIT
 OPT_DEFS += -DPROTOCOL_PJRC

diff --git a/protocol/iwrap.mk b/protocol/iwrap.mk
index 3b63efe9ad6b138c274a27f39c18b5325050c971..eeedd83af2cf282c97211f6e85216c6e3ee09375 100644 (file)
--- a/protocol/iwrap.mk
+++ b/protocol/iwrap.mk
@@ -9,7 +9,7 @@ SRC +=  $(IWRAP_DIR)/main.c \
        $(COMMON_DIR)/uart.c
 
 # Search Path
-VPATH += $(TOP_DIR)/protocol/iwrap
+VPATH += $(TMK_DIR)/protocol/iwrap
 
 
 # TODO: compatible with LUFA and PJRC
@@ -21,6 +21,6 @@ SRC +=        $(VUSB_DIR)/vusb.c \
        $(VUSB_DIR)/usbdrv/usbdrv.c \
        $(VUSB_DIR)/usbdrv/usbdrvasm.S \
        $(VUSB_DIR)/usbdrv/oddebug.c
-VPATH += $(TOP_DIR)/protocol/vusb:$(TOP_DIR)/protocol/vusb/usbdrv
+VPATH += $(TMK_DIR)/protocol/vusb:$(TMK_DIR)/protocol/vusb/usbdrv
 
 

diff --git a/protocol/lufa.mk b/protocol/lufa.mk
index ac70ac03916639b906f562c6cc9a5d8f3d263a26..2575e89dfa5081e1ce7440bbd1e9ede0c2254c09 100644 (file)
--- a/protocol/lufa.mk
+++ b/protocol/lufa.mk
@@ -1,7 +1,7 @@
 LUFA_DIR = protocol/lufa
 
 # Path to the LUFA library
-ifeq (, $(wildcard $(TOP_DIR)/$(LUFA_DIR)/LUFA-git/LUFA/Version.h))
+ifeq (, $(wildcard $(TMK_DIR)/$(LUFA_DIR)/LUFA-git/LUFA/Version.h))
     LUFA_PATH ?= $(LUFA_DIR)/LUFA-120730
 else
     LUFA_PATH ?= $(LUFA_DIR)/LUFA-git
@@ -9,12 +9,12 @@ endif
 
 
 # Create the LUFA source path variables by including the LUFA makefile
-ifneq (, $(wildcard $(TOP_DIR)/$(LUFA_PATH)/LUFA/Build/lufa_sources.mk))
+ifneq (, $(wildcard $(TMK_DIR)/$(LUFA_PATH)/LUFA/Build/lufa_sources.mk))
     # New build system from 20120730
     LUFA_ROOT_PATH = $(LUFA_PATH)/LUFA
-    include $(TOP_DIR)/$(LUFA_PATH)/LUFA/Build/lufa_sources.mk 
+    include $(TMK_DIR)/$(LUFA_PATH)/LUFA/Build/lufa_sources.mk 
 else
-    include $(TOP_DIR)/$(LUFA_PATH)/LUFA/makefile
+    include $(TMK_DIR)/$(LUFA_PATH)/LUFA/makefile
 endif
 
 LUFA_SRC = $(LUFA_DIR)/lufa.c \
@@ -24,8 +24,8 @@ LUFA_SRC = $(LUFA_DIR)/lufa.c \
 SRC += $(LUFA_SRC)
 
 # Search Path
-VPATH += $(TOP_DIR)/$(LUFA_DIR)
-VPATH += $(TOP_DIR)/$(LUFA_PATH)
+VPATH += $(TMK_DIR)/$(LUFA_DIR)
+VPATH += $(TMK_DIR)/$(LUFA_PATH)
 
 # Option modules
 #ifdef $(or MOUSEKEY_ENABLE, PS2_MOUSE_ENABLE)

diff --git a/protocol/pjrc.mk b/protocol/pjrc.mk
index 5a446138203d48ce439a80f1435d3d017f9b88b1..36585de7dfbf182b620b29b7b7acc5b60e8308fb 100644 (file)
--- a/protocol/pjrc.mk
+++ b/protocol/pjrc.mk
@@ -20,7 +20,7 @@ ifdef EXTRAKEY_ENABLE
 endif
 
 # Search Path
-VPATH += $(TOP_DIR)/$(PJRC_DIR)
+VPATH += $(TMK_DIR)/$(PJRC_DIR)
 
 # This indicates using LUFA stack
 OPT_DEFS += -DPROTOCOL_PJRC

diff --git a/protocol/usb_hid.mk b/protocol/usb_hid.mk
index 8fda76c2e5be959cc2b64ae645fb70807385ae4d..1f79bda3bd64d3b95ec4d0aa9928ec50fdfbec1f 100644 (file)
--- a/protocol/usb_hid.mk
+++ b/protocol/usb_hid.mk
@@ -58,17 +58,17 @@ OPT_DEFS += -DARDUINO=101
 #
 # Search Path
 #
-VPATH += $(TOP_DIR)/$(USB_HID_DIR)
-VPATH += $(TOP_DIR)/$(USB_HOST_SHIELD_DIR)
+VPATH += $(TMK_DIR)/$(USB_HID_DIR)
+VPATH += $(TMK_DIR)/$(USB_HOST_SHIELD_DIR)
 
 # for #include "Arduino.h"
-VPATH += $(TOP_DIR)/$(ARDUINO_CORES_DIR)
+VPATH += $(TMK_DIR)/$(ARDUINO_CORES_DIR)
 
 # for #include "pins_arduino.h"
-VPATH += $(TOP_DIR)/$(ARDUINO_DIR)/variants/leonardo
+VPATH += $(TMK_DIR)/$(ARDUINO_DIR)/variants/leonardo
 
 # ad hoc workaround for compile problem on Windows:
 #    Windows doesn't know difference between common/print.h and arduino/Print.h.
 #    On Linux no problem.
 #    Change file name common/print.h to console.h ?
-VPATH := $(TOP_DIR)/common $(VPATH)
+VPATH := $(TMK_DIR)/common $(VPATH)

diff --git a/protocol/usb_hid/test/Makefile b/protocol/usb_hid/test/Makefile
index 39f5de4552f605fa1ae077aa10322900663985a9..83bf2aed67abdf4e24d9afe6dd0071d234e07b41 100644 (file)
--- a/protocol/usb_hid/test/Makefile
+++ b/protocol/usb_hid/test/Makefile
@@ -41,7 +41,7 @@
 # Target file name (without extension).
 TARGET = usb_hid_test
 
-TOP_DIR = ../../..
+TMK_DIR = ../../..
 
 # Directory keyboard dependent files exist
 TARGET_DIR = .
@@ -111,8 +111,8 @@ CONFIG_H = config.h
 
 # Search Path
 VPATH += $(TARGET_DIR)
-VPATH += $(TOP_DIR)
-VPATH += $(TOP_DIR)/common
+VPATH += $(TMK_DIR)
+VPATH += $(TMK_DIR)/common
 
 
 
@@ -121,6 +121,6 @@ PROGRAM_CMD = avrdude -p$(MCU) -cavr109 -P$(DEV) -b57600 -Uflash:w:$(TARGET).hex
 
 
 
-include $(TOP_DIR)/protocol/usb_hid.mk
-include $(TOP_DIR)/protocol/lufa.mk
-include $(TOP_DIR)/rules.mk
+include $(TMK_DIR)/protocol/usb_hid.mk
+include $(TMK_DIR)/protocol/lufa.mk
+include $(TMK_DIR)/rules.mk

diff --git a/protocol/vusb.mk b/protocol/vusb.mk
index 3227ca7bf5e6b58a4f07aac8cd8a9c4ea90dacc6..3cba3f71a32548e891d73239210a3b2f21042bf1 100644 (file)
--- a/protocol/vusb.mk
+++ b/protocol/vusb.mk
@@ -18,4 +18,4 @@ endif
 
 
 # Search Path
-VPATH += $(TOP_DIR)/protocol/vusb:$(TOP_DIR)/protocol/vusb/usbdrv
+VPATH += $(TMK_DIR)/protocol/vusb:$(TMK_DIR)/protocol/vusb/usbdrv

diff --git a/tool/mbed/common.mk b/tool/mbed/common.mk
index 403da9ac8d7881c19ef67c6cba46cb606135017b..77bf7c3e498fe95c12111aabaee6805cf5d2c9a9 100644 (file)
--- a/tool/mbed/common.mk
+++ b/tool/mbed/common.mk
@@ -77,5 +77,5 @@ endif
 ifdef KEYMAP_SECTION_ENABLE
     $(error Not Supported)
     OPT_DEFS += -DKEYMAP_SECTION_ENABLE
-    EXTRALDFLAGS = -Wl,-L$(TOP_DIR),-Tldscript_keymap_avr5.x
+    EXTRALDFLAGS = -Wl,-L$(TMK_DIR),-Tldscript_keymap_avr5.x
 endif