Makefile redo & other features (#395)

[qmk_firmware.git] / tmk_core / protocol / lufa.mk

diff --git a/tmk_core/protocol/lufa.mk b/tmk_core/protocol/lufa.mk
index 9ac6298f1110094445bf33ddcdb4d67d594361af..b0f8919007ab3b1428cc37d235e441f1e517b32c 100644 (file)
--- a/tmk_core/protocol/lufa.mk
+++ b/tmk_core/protocol/lufa.mk
@@ -5,23 +5,23 @@ LUFA_PATH ?= $(LUFA_DIR)/LUFA-git
 
 
 # Create the LUFA source path variables by including the LUFA makefile
-ifneq (, $(wildcard $(TMK_DIR)/$(LUFA_PATH)/LUFA/Build/lufa_sources.mk))
+ifneq (, $(wildcard $(TMK_PATH)/$(LUFA_PATH)/LUFA/Build/lufa_sources.mk))
     # New build system from 20120730
     LUFA_ROOT_PATH = $(LUFA_PATH)/LUFA
-    include $(TMK_DIR)/$(LUFA_PATH)/LUFA/Build/lufa_sources.mk 
+    include $(TMK_PATH)/$(LUFA_PATH)/LUFA/Build/lufa_sources.mk 
 else
-    include $(TMK_DIR)/$(LUFA_PATH)/LUFA/makefile
+    include $(TMK_PATH)/$(LUFA_PATH)/LUFA/makefile
 endif
 
-LUFA_SRC = $(LUFA_DIR)/lufa.c \
-          $(LUFA_DIR)/descriptor.c \
+LUFA_SRC = lufa.c \
+          descriptor.c \
           $(LUFA_SRC_USB)
 
 ifeq ($(strip $(MIDI_ENABLE)), yes)
-       LUFA_SRC += $(LUFA_DIR)/midi/midi.c \
-          $(LUFA_DIR)/midi/midi_device.c \
-          $(LUFA_DIR)/midi/bytequeue/bytequeue.c \
-          $(LUFA_DIR)/midi/bytequeue/interrupt_setting.c \
+       LUFA_SRC += midi/midi.c \
+          midi/midi_device.c \
+          midi/bytequeue/bytequeue.c \
+          midi/bytequeue/interrupt_setting.c \
           $(LUFA_SRC_USBCLASS)
 endif
 
@@ -33,8 +33,8 @@ endif
 SRC += $(LUFA_SRC)
 
 # Search Path
-VPATH += $(TMK_DIR)/$(LUFA_DIR)
-VPATH += $(TMK_DIR)/$(LUFA_PATH)
+VPATH += $(TMK_PATH)/$(LUFA_DIR)
+VPATH += $(TMK_PATH)/$(LUFA_PATH)
 
 # Option modules
 #ifdef $(or MOUSEKEY_ENABLE, PS2_MOUSE_ENABLE)