From bf1987e23311b6ea19899e4d12eec26b02539379 Mon Sep 17 00:00:00 2001 From: Reed Swiernik Date: Wed, 22 Apr 2015 00:45:03 -0400 Subject: updated makefile --- keyboard/planck/Makefile | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) (limited to 'keyboard/planck/Makefile') diff --git a/keyboard/planck/Makefile b/keyboard/planck/Makefile index 3716f0db92..68a4181f9a 100644 --- a/keyboard/planck/Makefile +++ b/keyboard/planck/Makefile @@ -48,18 +48,22 @@ TOP_DIR = ../.. TARGET_DIR = . # # project specific files -# SRC = keymap_common.c \ -# matrix_handwire.c \ -# led.c \ -# backlight.c +ifdef COMMON +SRC = keymap_common.c \ + matrix_handwire.c \ + led.c \ + backlight.c -# ifdef KEYMAP -# SRC := keymap_$(KEYMAP).c $(SRC) -# else -# SRC := keymap_jack.c $(SRC) -# endif +ifdef KEYMAP + SRC := keymap_$(KEYMAP).c $(SRC) +else + SRC := keymap_jack.c $(SRC) +endif + +else # project specific files + SRC = extended_keymap_common.c \ matrix_handwire.c \ led.c \ @@ -71,6 +75,8 @@ else SRC := extended_keymap_jack.c $(SRC) endif +endif + CONFIG_H = config.h # MCU name -- cgit v1.2.3 From 0541af4ff9a7f510f3d0f1ef55df86f995023748 Mon Sep 17 00:00:00 2001 From: Reed Swiernik Date: Thu, 23 Apr 2015 04:31:39 -0400 Subject: Updated makefile to properly handle non extended keymaps --- keyboard/planck/Makefile | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'keyboard/planck/Makefile') diff --git a/keyboard/planck/Makefile b/keyboard/planck/Makefile index 68a4181f9a..ef11e3d32b 100644 --- a/keyboard/planck/Makefile +++ b/keyboard/planck/Makefile @@ -47,9 +47,12 @@ TOP_DIR = ../.. # Directory keyboard dependent files exist TARGET_DIR = . + + # # project specific files -ifdef COMMON -SRC = keymap_common.c \ +ifdef COMMON_KEYMAP + + SRC = keymap_common.c \ matrix_handwire.c \ led.c \ backlight.c @@ -62,9 +65,7 @@ endif else -# project specific files - -SRC = extended_keymap_common.c \ +SRC = extended_keymap_common.c \ matrix_handwire.c \ led.c \ backlight.c -- cgit v1.2.3