Merge remote-tracking branch 'remotes/jackhumbert/master'

1 files changed, 16 insertions, 87 deletions

diff --git a/keyboard/atomic/Makefile b/keyboard/atomic/Makefile
index c1a0a6db42..0940d8f277 100644
--- a/keyboard/atomic/Makefile
+++ b/keyboard/atomic/Makefile
@@ -38,55 +38,6 @@
 # To rebuild project do "make clean" then "make all".
 #----------------------------------------------------------------------------
 
-# Target file name (without extension).
-TARGET = atomic
-
-# Directory common source filess exist
-TOP_DIR = ../..
-TMK_DIR = ../../tmk_core
-
-# Directory keyboard dependent files exist
-TARGET_DIR = .
-
-# # project specific files
-SRC = atomic.c
-
-ifdef keymap
-	KEYMAP = $(keymap)
-endif
-
-ifdef KEYMAP
-ifneq ("$(wildcard keymaps/$(KEYMAP).c)","")
-	KEYMAP_FILE = keymaps/$(KEYMAP).c
-else
-ifneq ("$(wildcard keymaps/$(KEYMAP)/keymap.c)","")
-	KEYMAP_FILE = keymaps/$(KEYMAP)/keymap.c
-ifneq ("$(wildcard keymaps/$(KEYMAP)/makefile.mk)","")
-	include keymaps/$(KEYMAP)/makefile.mk
-endif
-else
-$(error Keymap file does not exist)
-endif 
-endif
-
-else
-
-ifneq ("$(wildcard keymaps/default.c)","")
-	KEYMAP_FILE = keymaps/default.c
-else
-	KEYMAP_FILE = keymaps/default/keymap.c
-endif
-
-ifneq ("$(wildcard keymaps/default/makefile.mk)","")
-	include keymaps/default/makefile.mk
-endif
-
-endif
-
-SRC := $(KEYMAP_FILE) $(SRC)
-
-CONFIG_H = config.h
-
 # MCU name
 #MCU = at90usb1287
 MCU = atmega32u4
@@ -139,44 +90,22 @@ OPT_DEFS += -DBOOTLOADER_SIZE=4096
 #   change to "no" to disable the options, or define them in the makefile.mk in 
 #   the appropriate keymap folder that will get included automatically
 #
-BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration(+1000)
-MOUSEKEY_ENABLE  = yes # Mouse keys(+4700)
-EXTRAKEY_ENABLE  = yes # Audio control and System control(+450)
-CONSOLE_ENABLE   = no # Console for debug(+400)
-COMMAND_ENABLE   = yes # Commands for debug and configuration
-NKRO_ENABLE      = no  # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
-MIDI_ENABLE      = no  # MIDI controls
-AUDIO_ENABLE     = no  # Audio output on port C6
-UNICODE_ENABLE   = no  # Unicode
-BLUETOOTH_ENABLE = no  # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE  = no  # Enable WS2812 RGB underlight.  Do not enable this with audio at the same time.
+BOOTMAGIC_ENABLE ?= no       # Virtual DIP switch configuration(+1000)
+MOUSEKEY_ENABLE ?= yes       # Mouse keys(+4700)
+EXTRAKEY_ENABLE ?= yes       # Audio control and System control(+450)
+CONSOLE_ENABLE ?= no         # Console for debug(+400)
+COMMAND_ENABLE ?= yes        # Commands for debug and configuration
+NKRO_ENABLE ?= no            # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+BACKLIGHT_ENABLE ?= yes      # Enable keyboard backlight functionality
+MIDI_ENABLE ?= no            # MIDI controls
+AUDIO_ENABLE ?= no           # Audio output on port C6
+UNICODE_ENABLE ?= no         # Unicode
+BLUETOOTH_ENABLE ?= no       # Enable Bluetooth with the Adafruit EZ-Key HID
+RGBLIGHT_ENABLE ?= no        # Enable WS2812 RGB underlight.  Do not enable this with audio at the same time.
 
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no  # Breathing sleep LED during USB suspend
-
-ifdef KEYMAP
-
-ifeq ("$(wildcard keymaps/$(KEYMAP).c)","")
-ifneq ("$(wildcard keymaps/$(KEYMAP)/makefile.mk)","")
-	include keymaps/$(KEYMAP)/makefile.mk
-endif 
-endif
-
-else
-
-ifneq ("$(wildcard keymaps/default/makefile.mk)","")
-	include keymaps/default/makefile.mk
-endif
-
-endif
-
-# Optimize size but this may cause error "relocation truncated to fit"
-#EXTRALDFLAGS = -Wl,--relax
-
-# Search Path
-VPATH += $(TARGET_DIR)
-VPATH += $(TOP_DIR)
-VPATH += $(TMK_DIR)
+SLEEP_LED_ENABLE ?= no    # Breathing sleep LED during USB suspend
 
-include $(TOP_DIR)/quantum/quantum.mk
\ No newline at end of file
+ifndef QUANTUM_DIR
+	include ../../Makefile
+endif
\ No newline at end of file