From 27a673f5cf75747fe73641059aae60e9b53a1c78 Mon Sep 17 00:00:00 2001
From: Fred Sundvik <fsundvik@gmail.com>
Date: Sun, 21 Aug 2016 17:14:38 +0300
Subject: The makefile actually calls build_test

---
 build_keyboard.mk | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

(limited to 'build_keyboard.mk')

diff --git a/build_keyboard.mk b/build_keyboard.mk
index f843572f66..bbe5718459 100644
--- a/build_keyboard.mk
+++ b/build_keyboard.mk
@@ -4,19 +4,7 @@ endif
 
 .DEFAULT_GOAL := all
 
-include message.mk
-
-
-# Directory common source filess exist
-TOP_DIR = .
-TMK_DIR = tmk_core
-TMK_PATH = $(TOP_DIR)/$(TMK_DIR)
-LIB_PATH = $(TOP_DIR)/lib
-
-QUANTUM_DIR = quantum
-QUANTUM_PATH = $(TOP_DIR)/$(QUANTUM_DIR)
-
-BUILD_DIR := $(TOP_DIR)/.build
+include common.mk
 
 ifneq ($(SUBPROJECT),)
 	TARGET ?= $(KEYBOARD)_$(SUBPROJECT)_$(KEYMAP)
-- 
cgit v1.2.3


From 8a9aac6e3237a505682cc7249a8dfff6cb964343 Mon Sep 17 00:00:00 2001
From: Fred Sundvik <fsundvik@gmail.com>
Date: Mon, 22 Aug 2016 09:16:08 +0300
Subject: Rules for compiling and linking google test

---
 build_keyboard.mk | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'build_keyboard.mk')

diff --git a/build_keyboard.mk b/build_keyboard.mk
index bbe5718459..869d672b01 100644
--- a/build_keyboard.mk
+++ b/build_keyboard.mk
@@ -204,6 +204,14 @@ $(KEYBOARD_OUTPUT)_DEFS := $(PROJECT_DEFS)
 $(KEYBOARD_OUTPUT)_INC := $(PROJECT_INC)
 $(KEYBOARD_OUTPUT)_CONFIG  := $(PROJECT_CONFIG)
 
+# Default target.
+all: build sizeafter
+
+# Change the build target to build a HEX file or a library.
+build: elf hex
+#build: elf hex eep lss sym
+#build: lib
+
 
 include $(TMK_PATH)/rules.mk
 
-- 
cgit v1.2.3


From 0a11460175d6a838c71343c19eb4ce4699936247 Mon Sep 17 00:00:00 2001
From: Fred Sundvik <fsundvik@gmail.com>
Date: Wed, 24 Aug 2016 22:23:17 +0300
Subject: Build actual tests, convert byte_stuffer_tests

---
 build_keyboard.mk | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'build_keyboard.mk')

diff --git a/build_keyboard.mk b/build_keyboard.mk
index 869d672b01..164794c634 100644
--- a/build_keyboard.mk
+++ b/build_keyboard.mk
@@ -155,12 +155,8 @@ ifeq ($(strip $(TAP_DANCE_ENABLE)), yes)
 endif
 
 ifeq ($(strip $(SERIAL_LINK_ENABLE)), yes)
-	SERIAL_DIR = $(QUANTUM_DIR)/serial_link
-	SERIAL_PATH = $(QUANTUM_PATH)/serial_link
-	SERIAL_SRC = $(wildcard $(SERIAL_PATH)/protocol/*.c)
-	SERIAL_SRC += $(wildcard $(SERIAL_PATH)/system/*.c)
 	SRC += $(patsubst $(QUANTUM_PATH)/%,%,$(SERIAL_SRC))
-	OPT_DEFS += -DSERIAL_LINK_ENABLE
+	OPT_DEFS += $(SERIAL_DEFS)
 	VAPTH += $(SERIAL_PATH)
 endif
 
-- 
cgit v1.2.3


From c692fd1d55cb2103e9f7c40c8953ec92b5178c52 Mon Sep 17 00:00:00 2001
From: Fred Sundvik <fsundvik@gmail.com>
Date: Sat, 27 Aug 2016 13:43:12 +0300
Subject: More common settings for unit tests and keyboards

---
 build_keyboard.mk | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

(limited to 'build_keyboard.mk')

diff --git a/build_keyboard.mk b/build_keyboard.mk
index 164794c634..5bec4ecf66 100644
--- a/build_keyboard.mk
+++ b/build_keyboard.mk
@@ -23,6 +23,16 @@ ifdef master
 	MASTER = $(master)
 endif
 
+ifeq ($(MASTER),right)	
+	OPT_DEFS += -DMASTER_IS_ON_RIGHT
+else 
+	ifneq ($(MASTER),left)
+$(error MASTER does not have a valid value(left/right))
+	endif
+endif
+
+
+
 KEYBOARD_PATH := keyboards/$(KEYBOARD)
 KEYBOARD_C := $(KEYBOARD_PATH)/$(KEYBOARD).c
 
@@ -169,15 +179,14 @@ ifneq ($(SUBPROJECT),)
 	VPATH += $(SUBPROJECT_PATH)
 endif
 VPATH += $(KEYBOARD_PATH)
-VPATH += $(TOP_DIR)
-VPATH += $(TMK_PATH)
-VPATH += $(QUANTUM_PATH)
-VPATH += $(QUANTUM_PATH)/keymap_extras
-VPATH += $(QUANTUM_PATH)/audio
-VPATH += $(QUANTUM_PATH)/process_keycode
+VPATH += $(COMMON_VPATH)
 
 
 include $(TMK_PATH)/common.mk
+SRC += $(TMK_COMMON_SRC)
+OPT_DEFS += $(TMK_COMMON_DEFS)
+EXTRALDFLAGS += $(TMK_COMMON_LDFLAGS)
+
 ifeq ($(PLATFORM),AVR)
 	include $(TMK_PATH)/protocol/lufa.mk
 	include $(TMK_PATH)/avr.mk
@@ -189,11 +198,13 @@ ifeq ($(strip $(VISUALIZER_ENABLE)), yes)
 	include $(VISUALIZER_PATH)/visualizer.mk
 endif
 
+$(info $(VPATH))
+
 
 OUTPUTS := $(KEYMAP_OUTPUT) $(KEYBOARD_OUTPUT)
 $(KEYMAP_OUTPUT)_SRC := $(SRC)
 $(KEYMAP_OUTPUT)_DEFS := $(OPT_DEFS) -DQMK_KEYBOARD=\"$(KEYBOARD)\" -DQMK_KEYMAP=\"$(KEYMAP)\" 
-$(KEYMAP_OUTPUT)_INC := $(EXTRAINCDIRS) $(VPATH)
+$(KEYMAP_OUTPUT)_INC :=  $(VPATH) $(EXTRAINCDIRS)
 $(KEYMAP_OUTPUT)_CONFIG := $(CONFIG_H)
 $(KEYBOARD_OUTPUT)_SRC := $(CHIBISRC)
 $(KEYBOARD_OUTPUT)_DEFS := $(PROJECT_DEFS)
-- 
cgit v1.2.3


From 6410f0c021792ebbbd279fc6150f197274e914c8 Mon Sep 17 00:00:00 2001
From: Fred Sundvik <fsundvik@gmail.com>
Date: Sat, 27 Aug 2016 18:13:01 +0300
Subject: The all target makes all keyboards and all tests

---
 build_keyboard.mk | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'build_keyboard.mk')

diff --git a/build_keyboard.mk b/build_keyboard.mk
index 5bec4ecf66..04632c1c94 100644
--- a/build_keyboard.mk
+++ b/build_keyboard.mk
@@ -198,9 +198,6 @@ ifeq ($(strip $(VISUALIZER_ENABLE)), yes)
 	include $(VISUALIZER_PATH)/visualizer.mk
 endif
 
-$(info $(VPATH))
-
-
 OUTPUTS := $(KEYMAP_OUTPUT) $(KEYBOARD_OUTPUT)
 $(KEYMAP_OUTPUT)_SRC := $(SRC)
 $(KEYMAP_OUTPUT)_DEFS := $(OPT_DEFS) -DQMK_KEYBOARD=\"$(KEYBOARD)\" -DQMK_KEYMAP=\"$(KEYMAP)\" 
-- 
cgit v1.2.3