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

[max/tmk_keyboard.git] / keyboard / ergodox / Makefile.pjrc

diff --git a/keyboard/ergodox/Makefile.pjrc b/keyboard/ergodox/Makefile.pjrc
index 998b625f5e99ec3637a54415820be9d92da00ec3..04b07d9fb03bab41b67d92a05a6d2c84a98d9da0 100644 (file)
--- a/keyboard/ergodox/Makefile.pjrc
+++ b/keyboard/ergodox/Makefile.pjrc
@@ -42,18 +42,24 @@
 TARGET = ergodox_pjrc
 
 # Directory common source filess exist
-TMK_DIR = ../..
+TMK_DIR = ../../tmk_core
 
 # Directory keyboard dependent files exist
 TARGET_DIR = .
 
 # project specific files
-SRC =  keymap.c \
+SRC =  keymap_common.c \
        matrix.c \
        led.c \
        ergodox.c \
        twimaster.c
 
+ifdef KEYMAP
+    SRC := keymap_$(KEYMAP).c $(SRC)
+else
+    SRC := keymap_blazak.c $(SRC)
+endif
+
 CONFIG_H = config.h
 
 
@@ -100,20 +106,3 @@ include $(TMK_DIR)/protocol.mk
 include $(TMK_DIR)/protocol/pjrc.mk
 include $(TMK_DIR)/common.mk
 include $(TMK_DIR)/rules.mk
-
-dvorak: OPT_DEFS += -DKEYMAP_DVORAK
-dvorak: all
-
-colemak: OPT_DEFS += -DKEYMAP_COLEMAK
-colemak: all
-
-workman: OPT_DEFS += -DKEYMAP_WORKMAN
-workman: all
-
-micro: OPT_DEFS += -DKEYMAP_MICRO
-micro: all
-
-cub: OPT_DEFS += -DKEYMAP_CUB
-cub: all
-
-