Merge branch 'master' of https://github.com/nemith/tmk_keyboard into nemith-master

[max/tmk_keyboard.git] / keyboard / infinity / Makefile

diff --git a/keyboard/infinity/Makefile b/keyboard/infinity/Makefile
index e33c239afbe08db50e956699fa50e522298a2ca6..5b3c1fe6f62ccf5440312450e4e77addcb6a747e 100644 (file)
--- a/keyboard/infinity/Makefile
+++ b/keyboard/infinity/Makefile
@@ -1,18 +1,14 @@
 PROJECT = infinity
 
-TMK_DIR = ../..
-MBED_DIR = $(TMK_DIR)/mbed-sdk
+TMK_DIR = ../../tmk_core
+MBED_DIR = $(TMK_DIR)/tool/mbed/mbed-sdk
 
-#VPATH += $(MBED_DIR):$(TMK_DIR)
-vpath %.s .:$(MBED_DIR):$(TMK_DIR)
-vpath %.c .:$(MBED_DIR):$(TMK_DIR)
-vpath %.cpp .:$(MBED_DIR):$(TMK_DIR)
+VPATH += $(TMK_DIR):$(MBED_DIR)
 
 OBJDIR = ./build
 
 OBJECTS = \
        $(OBJDIR)/matrix.o \
-       $(OBJDIR)/keymap_common.o \
        $(OBJDIR)/led.o \
        $(OBJDIR)/main.o
 
@@ -33,9 +29,9 @@ INCLUDE_PATHS = -I.
 #MOUSEKEY_ENABLE = yes
 
 
+include $(TMK_DIR)/tool/mbed/common.mk
 include mbed-infinity.mk
 include $(TMK_DIR)/tool/mbed/mbed.mk
-include $(TMK_DIR)/tool/mbed/common.mk
 include $(TMK_DIR)/tool/mbed/gcc.mk
 
 program: $(OBJDIR)/$(PROJECT).bin