ahoneybun/qmk_firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Change TOP_DIR to TMK_DIR in makefiles

Browse source
This commit is contained in:
tmk 2015-04-09 16:20:42 +09:00
parent 08ec8bbe5d
commit b4e2d325f3
58 changed files with 295 additions and 295 deletions
Download patch file Download diff file Expand all files Collapse all files

6
protocol/bluefruit.mk
View file

@ -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

4
protocol/iwrap.mk
View file

@ -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

12
protocol/lufa.mk
View file

@ -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)

2
protocol/pjrc.mk
View file

@ -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

10
protocol/usb_hid.mk
View file

@ -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)

12
protocol/usb_hid/test/Makefile
View file

@ -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

2
protocol/vusb.mk
View file

@ -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