Merge commit '1fe4406f374291ab2e86e95a97341fd9c475fcb8'

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

diff --git a/keyboard/infinity/Makefile b/keyboard/infinity/Makefile
index e97f759dfa235fcaa424bbf87cad98eca6cdbcfc..aa3e9bff1af61cc3be749ac3424dd361b180c008 100644 (file)
--- a/keyboard/infinity/Makefile
+++ b/keyboard/infinity/Makefile
@@ -1,6 +1,6 @@
 PROJECT = infinity
 
-TMK_DIR = ../..
+TMK_DIR = ../../tmk_core
 MBED_DIR = $(TMK_DIR)/mbed-sdk
 
 #VPATH += $(MBED_DIR):$(TMK_DIR)
@@ -11,8 +11,17 @@ vpath %.cpp .:$(MBED_DIR):$(TMK_DIR)
 OBJDIR = ./build
 
 OBJECTS = \
+       $(OBJDIR)/matrix.o \
+       $(OBJDIR)/keymap_common.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.
@@ -29,5 +38,5 @@ 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