aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--common.mk4
-rw-r--r--converter/adb_usb/Makefile12
-rw-r--r--converter/adb_usb/Makefile.pjrc12
-rw-r--r--converter/ascii_usb/Makefile12
-rw-r--r--converter/ibm4704_usb/Makefile12
-rw-r--r--converter/m0110_usb/Makefile12
-rw-r--r--converter/m0110_usb/Makefile.pjrc12
-rw-r--r--converter/m0110_usb/Makefile.teensy12
-rw-r--r--converter/news_usb/Makefile.pjrc12
-rw-r--r--converter/next_usb/Makefile12
-rw-r--r--converter/next_usb/Makefile.pjrc12
-rw-r--r--converter/pc98_usb/Makefile12
-rw-r--r--converter/ps2_usb/Makefile12
-rw-r--r--converter/ps2_usb/Makefile.pjrc12
-rw-r--r--converter/ps2_usb/Makefile.tmk_rev112
-rw-r--r--converter/ps2_usb/Makefile.tmk_rev212
-rw-r--r--converter/ps2_usb/Makefile.vusb12
-rw-r--r--converter/serialmouse_usb/Makefile12
-rw-r--r--converter/sun_usb/Makefile12
-rw-r--r--converter/terminal_bluefruit/Makefile14
-rw-r--r--converter/terminal_usb/Makefile12
-rw-r--r--converter/usb_usb/Makefile12
-rw-r--r--converter/x68k_usb/Makefile12
-rw-r--r--keyboard/IIgs/Makefile10
-rw-r--r--keyboard/alps64/Makefile10
-rw-r--r--keyboard/gh60/Makefile10
-rw-r--r--keyboard/gh60/Makefile.pjrc10
-rw-r--r--keyboard/ghost_squid/Makefile.lufa10
-rw-r--r--keyboard/hbkb/Makefile.lufa10
-rw-r--r--keyboard/hhkb/Makefile10
-rw-r--r--keyboard/hhkb/Makefile.pjrc10
-rw-r--r--keyboard/hhkb/Makefile.rn4212
-rw-r--r--keyboard/hhkb/not_supported/Makefile.iwrap12
-rw-r--r--keyboard/hhkb/not_supported/Makefile.vusb10
-rw-r--r--keyboard/hid_liber/Makefile.lufa10
-rw-r--r--keyboard/hid_liber/Makefile.pjrc10
-rw-r--r--keyboard/kitten_paw/Makefile.lufa10
-rw-r--r--keyboard/kmac/Makefile.lufa10
-rw-r--r--keyboard/kmac/Makefile.pjrc10
-rw-r--r--keyboard/lightpad/Makefile.lufa10
-rw-r--r--keyboard/lightsaber/Makefile.lufa10
-rw-r--r--keyboard/lightsaber/Makefile.pjrc10
-rw-r--r--keyboard/macway/Makefile.lufa10
-rw-r--r--keyboard/macway/Makefile.pjrc10
-rw-r--r--keyboard/nerd/Makefile10
-rw-r--r--keyboard/onekey/Makefile12
-rw-r--r--keyboard/onekey/Makefile.pjrc12
-rw-r--r--keyboard/phantom/Makefile.lufa10
-rw-r--r--keyboard/phantom/Makefile.pjrc10
-rw-r--r--protocol.mk2
-rw-r--r--protocol/bluefruit.mk6
-rw-r--r--protocol/iwrap.mk4
-rw-r--r--protocol/lufa.mk12
-rw-r--r--protocol/pjrc.mk2
-rw-r--r--protocol/usb_hid.mk10
-rw-r--r--protocol/usb_hid/test/Makefile12
-rw-r--r--protocol/vusb.mk2
-rw-r--r--tool/mbed/common.mk2
58 files changed, 295 insertions, 295 deletions
diff --git a/common.mk b/common.mk
index b854f09cd..d22adff51 100644
--- 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 bbb7810ee..16770fa41 100644
--- 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 2eb41b34b..69e2325f9 100644
--- 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 408aa4237..b9549e38a 100644
--- 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 112b00129..c1e8c385d 100644
--- 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 6f20396f5..466285fe9 100644
--- 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 37977a384..5faf5c255 100644
--- 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 9a5c41068..f664b6753 100644
--- 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 98f8d5769..29b27acf6 100644
--- 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 fef539a14..719081f9b 100644
--- 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 51d9de6b1..75ca13c9e 100644
--- 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 71c7858f3..56738b34b 100644
--- 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 1dd23c157..39455defd 100644
--- 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 0e175f8b4..2aa2a8dc3 100644
--- 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 59c44f75f..8b227c2f6 100644
--- 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 bad958c36..93e226615 100644
--- 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 ddf186845..facee6905 100644
--- 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 ea0e439bd..87b5aacbb 100644
--- 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 b32497cd9..19e188100 100644
--- 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 28b7397ba..d28cbf008 100644
--- 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 16df638b9..de0710f7c 100644
--- 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 d6867bb00..a1ceaaa4e 100644
--- 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 948622c7c..a34e1c79f 100644
--- 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 c18e9720c..938877c3d 100644
--- 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 a7d59309e..3e0dccc9e 100644
--- 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 fd202c179..347847f77 100644
--- 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 9655ff65a..291579e64 100644
--- 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 61893893a..cfd7e8ecf 100644
--- 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 0d103c876..47101ec09 100644
--- 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 dc5c06a94..ea5a65ea2 100644
--- 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 b6ce9c750..53bb784cf 100644
--- 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 b1eacd070..66bdba917 100644
--- 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 2d9d82c48..5bc94d5f6 100644
--- 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 4343b210d..61fd92889 100644
--- 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 c99d1a32f..89c2d6fdf 100644
--- 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 42fb6895e..63d1fef72 100644
--- 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 4a643ea79..d793d9869 100644
--- 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 09343d4bc..fd0091aa3 100644
--- 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 22ee8de47..61c9c1530 100644
--- 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 7bce7ebff..b5240b2d5 100644
--- 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 b430efd22..25cacacc4 100644
--- 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 58735a7ef..e5dec297c 100644
--- 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 359a8c246..8f216e726 100644
--- 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 9e84a3418..3d67b1b7d 100644
--- 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 5fd382841..554fc8b3f 100644
--- 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 78732e470..54a2d486f 100644
--- 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 24ade3350..e4ca0783a 100644
--- 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 97756de0a..55d155b15 100644
--- 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 aa01ac5ab..bc57af6a5 100644
--- 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 d9194b2bf..726f658a0 100644
--- 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 7e6328f6c..e1c5fff77 100644
--- 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 3b63efe9a..eeedd83af 100644
--- 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 ac70ac039..2575e89df 100644
--- 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 5a4461382..36585de7d 100644
--- 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 8fda76c2e..1f79bda3b 100644
--- 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 39f5de455..83bf2aed6 100644
--- 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 3227ca7bf..3cba3f71a 100644
--- 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 403da9ac8..77bf7c3e4 100644
--- 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