From a53bc24c4d5a6b1f31060e43789a12af6e39b572 Mon Sep 17 00:00:00 2001
From: Jack Humbert <jack.humb@gmail.com>
Date: Sat, 28 May 2016 15:33:08 -0400
Subject: makes .SILENT (less verbose) by default - override with VERBOSE=1

also took out some @echo newlines to make things a bit cleaner
---
 quantum/quantum.mk | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'quantum/quantum.mk')

diff --git a/quantum/quantum.mk b/quantum/quantum.mk
index c099d67939..00d3e81142 100644
--- a/quantum/quantum.mk
+++ b/quantum/quantum.mk
@@ -1,5 +1,9 @@
 QUANTUM_DIR = quantum
 
+ifndef VERBOSE
+.SILENT:
+endif
+
 # # project specific files
 SRC += $(QUANTUM_DIR)/quantum.c \
 	$(QUANTUM_DIR)/keymap_common.c \
-- 
cgit v1.2.3


From d9e4dad0a828a8a904f44dda090a4d6d08fe2948 Mon Sep 17 00:00:00 2001
From: Jack Humbert <jack.humb@gmail.com>
Date: Sat, 11 Jun 2016 13:31:31 -0400
Subject: Makefile redo & other features (#395)

* .build containment implemented

* no destructive variable setting - builds in either folder

* make from 3 places

* cleans before each build
* make from root with keyboard=keyboard, keymap=keymap
* make from keyboard/keyboard with keymap=keymap
* make from keymaps/keymap
* only implemented on planck

* adds color diag to avr-gcc

* makefiles for all plancks, clean-up

* quick build-all makefile for plancks

* reformatting of make output (colors)

* color toggle, tmk path corrections

* correct if statement for color

* move config.h to main makefile, updates preonic, atomic

* format update, all keyboards targets

* makefile optional for build all target, alps and arrow_pad updated

* alps updated

* make planck default, trying out travis recipe for all-keyboards

* all-keymaps target, different travis recipe

* updates alps64

* updates keyboards to new format

* updates clue* projects

* all projects updated, specialise EZ .hex, let .hex through

* updates travis

* automatically find root, keyboard, keymap

* silent echo, cleaned-up mass make output

* updates all keyboards' .hex files except EZ

* Rename Bantam44.c to bantam44.c

* Rename Bantam44.h to bantam44.h

* nananana

* adds six key keyboard

* does same to ez as rest

* updates send_string example

* brings ergodox_ez up to date

* updates template/new project script

* adds sixkeyboard

* adds readme for sixkeyboard

* adds sixkeyboard to travis

* filenames, gitignore mess

* define clock prescaler stuff manually

* make quick, size test example

* documentation and dfu-no-build
---
 quantum/quantum.mk | 58 ------------------------------------------------------
 1 file changed, 58 deletions(-)
 delete mode 100644 quantum/quantum.mk

(limited to 'quantum/quantum.mk')

diff --git a/quantum/quantum.mk b/quantum/quantum.mk
deleted file mode 100644
index 00d3e81142..0000000000
--- a/quantum/quantum.mk
+++ /dev/null
@@ -1,58 +0,0 @@
-QUANTUM_DIR = quantum
-
-ifndef VERBOSE
-.SILENT:
-endif
-
-# # project specific files
-SRC += $(QUANTUM_DIR)/quantum.c \
-	$(QUANTUM_DIR)/keymap_common.c \
-	$(QUANTUM_DIR)/led.c
-
-# ifdef KEYMAP_FILE
-# ifneq (,$(shell grep USING_MIDI '$(KEYMAP_FILE)'))
-# MIDI_ENABLE=yes
-# $(info  * Overriding MIDI_ENABLE setting - $(KEYMAP_FILE) requires it)
-# endif
-# ifneq (,$(shell grep USING_UNICODE '$(KEYMAP_FILE)'))
-# UNICODE_ENABLE=yes
-# $(info  * Overriding UNICODE_ENABLE setting - $(KEYMAP_FILE) requires it)
-# endif
-# ifneq (,$(shell grep USING_BACKLIGHT '$(KEYMAP_FILE)'))
-# BACKLIGHT_ENABLE=yes
-# $(info  * Overriding BACKLIGHT_ENABLE setting - $(KEYMAP_FILE) requires it)
-# endif
-# endif
-
-ifndef CUSTOM_MATRIX
-	SRC += $(QUANTUM_DIR)/matrix.c
-endif
-
-#ifeq ($(strip $(MIDI_ENABLE)), yes)
-#	SRC += $(QUANTUM_DIR)/keymap_midi.c
-#endif
-
-ifeq ($(strip $(AUDIO_ENABLE)), yes)
-    SRC += $(QUANTUM_DIR)/audio/audio.c
-    SRC += $(QUANTUM_DIR)/audio/voices.c
-    SRC += $(QUANTUM_DIR)/audio/luts.c
-endif
-
-ifeq ($(strip $(RGBLIGHT_ENABLE)), yes)
-	SRC += $(QUANTUM_DIR)/light_ws2812.c
-	SRC += $(QUANTUM_DIR)/rgblight.c
-	OPT_DEFS += -DRGBLIGHT_ENABLE
-endif
-
-# Optimize size but this may cause error "relocation truncated to fit"
-#EXTRALDFLAGS = -Wl,--relax
-
-# Search Path
-VPATH += $(TOP_DIR)/$(QUANTUM_DIR)
-VPATH += $(TOP_DIR)/$(QUANTUM_DIR)/keymap_extras
-VPATH += $(TOP_DIR)/$(QUANTUM_DIR)/audio
-
-include $(TMK_DIR)/protocol/lufa.mk
-
-include $(TMK_DIR)/common.mk
-include $(TMK_DIR)/rules.mk
-- 
cgit v1.2.3