X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=keyboard%2Finfinity%2FMakefile;h=5b3c1fe6f62ccf5440312450e4e77addcb6a747e;hb=657193dd6c0bafff9bc5f8125c4b050e30c1e82c;hp=e97f759dfa235fcaa424bbf87cad98eca6cdbcfc;hpb=c6e533ce83d6ae4393e6cdf1f6d39ffefc790115;p=max%2Ftmk_keyboard.git

diff --git a/keyboard/infinity/Makefile b/keyboard/infinity/Makefile
index e97f759d..5b3c1fe6 100644
--- a/keyboard/infinity/Makefile
+++ b/keyboard/infinity/Makefile
@@ -1,18 +1,23 @@
 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)/led.o \
 	$(OBJDIR)/main.o
 
+ifdef KEYMAP
+    OBJECTS := $(OBJDIR)/keymap_$(KEYMAP).o $(OBJECTS)
+else
+    OBJECTS := $(OBJDIR)/keymap.o $(OBJECTS)
+endif
+
 CONFIG_H = config.h
 
 INCLUDE_PATHS = -I.
@@ -24,10 +29,10 @@ 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:
+program: $(OBJDIR)/$(PROJECT).bin
 	dfu-util -D $(OBJDIR)/$(PROJECT).bin