Remove deprecated QUANTUM_DIR code blocks from makefiles (#4754)

* Remove QUANTUM_DIR code blocks from keyboard rules This commit removes the deprecated "QUANTUM_DIR" code block from rules.mk files that affect entire keyboards. * remove QUANTUM_DIR code blocks from rules for default keymaps This commit removes the deprecated "QUANTUM_DIR" code block from rules.mk files that affect default keymaps. * remove QUANTUM_DIR code blocks from rules for user keymaps This commit removes the deprecated "QUANTUM_DIR" code block from rules.mk files that affect "user" keymaps. (It's actually any keymap that isn't named `default`.) * remove QUANTUM_DIR code blocks from rules for community layouts This commit removes the deprecated "QUANTUM_DIR" code block from rules.mk files for community layouts. * remove QUANTUM_DIR code blocks from rules for userspaces This commit removes the deprecated "QUANTUM_DIR" code block from rules.mk files for userspaces.
2019-01-04 07:25:48 -08:00 · 2019-01-04 07:25:48 -08:00 · 7f4f0f7685
parent b1ed855871
commit 7f4f0f7685
293 changed files with 27 additions and 911 deletions
--- a/keyboards/6ball/keymaps/default/rules.mk
+++ b/keyboards/6ball/keymaps/default/rules.mk
@ -1,3 +0,0 @@
-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
--- a/keyboards/9key/keymaps/default/rules.mk
+++ b/keyboards/9key/keymaps/default/rules.mk
@ -1,3 +0,0 @@
-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
--- a/keyboards/alu84/keymaps/turbomech/rules.mk
+++ b/keyboards/alu84/keymaps/turbomech/rules.mk
@ -10,6 +10,3 @@ AUDIO_ENABLE ?= no
 RGBLIGHT_ENABLE ?= yes
 UNICODE_ENABLE ?= yes

-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
--- a/keyboards/amj40/keymaps/default/rules.mk
+++ b/keyboards/amj40/keymaps/default/rules.mk
@ -18,7 +18,3 @@ RGBLIGHT_ENABLE  = yes  # Enable WS2812 RGB underlight.
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend

-
-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
--- a/keyboards/amj60/keymaps/iso_split_rshift/rules.mk
+++ b/keyboards/amj60/keymaps/iso_split_rshift/rules.mk
@ -18,6 +18,3 @@ RGBLIGHT_ENABLE  = no  # Enable WS2812 RGB underlight.
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend

-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
--- a/keyboards/atreus/keymaps/xk/rules.mk
+++ b/keyboards/atreus/keymaps/xk/rules.mk
@ -13,6 +13,3 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
 BOOTMAGIC_ENABLE = no       # Virtual DIP switch configuration(+1000)

-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
--- a/keyboards/bpiphany/tiger_lily/keymaps/default/rules.mk
+++ b/keyboards/bpiphany/tiger_lily/keymaps/default/rules.mk
@ -16,6 +16,3 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend

-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
--- a/keyboards/bpiphany/tiger_lily/keymaps/default_ansi/rules.mk
+++ b/keyboards/bpiphany/tiger_lily/keymaps/default_ansi/rules.mk
@ -16,6 +16,3 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend

-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
--- a/keyboards/chocopad/keymaps/default/rules.mk
+++ b/keyboards/chocopad/keymaps/default/rules.mk
@ -1,5 +1,2 @@
 RGBLIGHT_ENABLE = yes

-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
--- a/keyboards/chocopad/keymaps/khord/rules.mk
+++ b/keyboards/chocopad/keymaps/khord/rules.mk
@ -1,5 +1,2 @@
 RGBLIGHT_ENABLE = yes

-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
--- a/keyboards/christmas_tree/keymaps/default/rules.mk
+++ b/keyboards/christmas_tree/keymaps/default/rules.mk
@ -1,3 +0,0 @@
-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
--- a/keyboards/clueboard/66/keymaps/xyverz/rules.mk
+++ b/keyboards/clueboard/66/keymaps/xyverz/rules.mk
@ -44,6 +44,3 @@
 #
 RGBLIGHT_ENABLE = yes        # Enable WS2812 RGB underlight. 

-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
--- a/keyboards/clueboard/card/keymaps/default/rules.mk
+++ b/keyboards/clueboard/card/keymaps/default/rules.mk
@ -16,6 +16,3 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = yes        # Enable WS2812 RGB underlight.
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend

-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
--- a/keyboards/clueboard/card/keymaps/rgb_effects/rules.mk
+++ b/keyboards/clueboard/card/keymaps/rgb_effects/rules.mk
@ -16,6 +16,3 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = yes        # Enable WS2812 RGB underlight.
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend

-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
--- a/keyboards/comet46/keymaps/satt/rules.mk
+++ b/keyboards/comet46/keymaps/satt/rules.mk
@ -5,3 +5,4 @@ SRC +=  ./lib/glcdfont.c \
 		./lib/keylogger.c \
        ./lib/modifier_state_reader.c \
        ./lib/host_led_state_reader.c
+
--- a/keyboards/contra/keymaps/dana/rules.mk
+++ b/keyboards/contra/keymaps/dana/rules.mk
@ -20,6 +20,3 @@ RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend

-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
--- a/keyboards/contra/keymaps/losinggeneration/rules.mk
+++ b/keyboards/contra/keymaps/losinggeneration/rules.mk
@ -12,6 +12,3 @@ MIDI_ENABLE      = no    # MIDI controls
 NKRO_ENABLE      = no    # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
 RGBLIGHT_ENABLE  = no    # Enable WS2812 RGB underlight. 

-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
--- a/keyboards/contra/keymaps/maxr1998/rules.mk
+++ b/keyboards/contra/keymaps/maxr1998/rules.mk
@ -9,6 +9,3 @@ MOUSEKEY_ENABLE = no
 CONSOLE_ENABLE  = no # yes
 COMMAND_ENABLE  = no

-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
--- a/keyboards/cu75/keymaps/default/rules.mk
+++ b/keyboards/cu75/keymaps/default/rules.mk
@ -23,10 +23,6 @@ ISSI_ENABLE = yes               # If the I2C pullup resistors aren't install thi
 WATCHDOG_ENABLE = no           # Resets keyboard if matrix_scan isn't run every 250ms


-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
-
 ifeq ($(strip $(ISSI_ENABLE)), yes)
    TMK_COMMON_DEFS += -DISSI_ENABLE
 endif
--- a/keyboards/cu75/keymaps/iso/rules.mk
+++ b/keyboards/cu75/keymaps/iso/rules.mk
@ -23,10 +23,6 @@ ISSI_ENABLE = no               # If the I2C pullup resistors aren't install this
 WATCHDOG_ENABLE = yes           # Resets keyboard if matrix_scan isn't run every 250ms


-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
-
 ifeq ($(strip $(ISSI_ENABLE)), yes)
    TMK_COMMON_DEFS += -DISSI_ENABLE
 endif
--- a/keyboards/deltasplit75/keymaps/itsaferbie/rules.mk
+++ b/keyboards/deltasplit75/keymaps/itsaferbie/rules.mk
@ -2,6 +2,3 @@ RGBLIGHT_ENABLE = yes        # Enable WS2812 RGB underlight.
 AUDIO_ENABLE = no            # Audio disabled while using RGB underlight.
 EXTRAKEY_ENABLE = yes

-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
--- a/keyboards/eco/keymaps/default/rules.mk
+++ b/keyboards/eco/keymaps/default/rules.mk
@ -20,6 +20,3 @@ RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend

-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
--- a/keyboards/eco/keymaps/hexwire/rules.mk
+++ b/keyboards/eco/keymaps/hexwire/rules.mk
@ -20,6 +20,3 @@ RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend

-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
--- a/keyboards/eco/keymaps/that_canadian/rules.mk
+++ b/keyboards/eco/keymaps/that_canadian/rules.mk
@ -20,6 +20,3 @@ RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend

-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
--- a/keyboards/ergodox_ez/keymaps/heartrobotninja/rules.mk
+++ b/keyboards/ergodox_ez/keymaps/heartrobotninja/rules.mk
@ -30,6 +30,3 @@ KEYMAP_BRANCH = $(shell \

 OPT_DEFS += -DKEYMAP_VERSION=\"$(KEYMAP_VERSION)\\\#$(KEYMAP_BRANCH)\"

-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
--- a/keyboards/fourier/keymaps/valgrahf/rules.mk
+++ b/keyboards/fourier/keymaps/valgrahf/rules.mk
@ -1,3 +0,0 @@
-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
--- a/keyboards/gh60/keymaps/dbroqua/rules.mk
+++ b/keyboards/gh60/keymaps/dbroqua/rules.mk
@ -106,7 +106,3 @@ NKRO_ENABLE = yes		    # USB Nkey Rollover - if this doesn't work, see here: htt
 # BLUETOOTH_ENABLE = yes	# Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = yes    # Enable RGB Underglow

-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
-
--- a/keyboards/gh60/keymaps/dbroqua_7U/rules.mk
+++ b/keyboards/gh60/keymaps/dbroqua_7U/rules.mk
@ -106,6 +106,3 @@ NKRO_ENABLE = yes		    # USB Nkey Rollover - if this doesn't work, see here: htt
 # BLUETOOTH_ENABLE = yes	# Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = no    # Enable RGB Underglow

-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
--- a/keyboards/gh60/keymaps/robotmaxtron/rules.mk
+++ b/keyboards/gh60/keymaps/robotmaxtron/rules.mk
@ -106,7 +106,3 @@ NKRO_ENABLE = yes		# USB Nkey Rollover - if this doesn't work, see here: https:/
 # BLUETOOTH_ENABLE = yes	# Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = yes          # Enable RGB Underglow

-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
-
--- a/keyboards/gh60/keymaps/sethbc/rules.mk
+++ b/keyboards/gh60/keymaps/sethbc/rules.mk
@ -1,3 +0,0 @@
-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
--- a/keyboards/gonnerd/keymaps/default/rules.mk
+++ b/keyboards/gonnerd/keymaps/default/rules.mk
@ -16,6 +16,3 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend

-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
--- a/keyboards/gonnerd/keymaps/gam3cat/rules.mk
+++ b/keyboards/gonnerd/keymaps/gam3cat/rules.mk
@ -22,3 +22,4 @@ FAUXCLICKY_ENABLE = no      # Uses buzzer to emulate clicky switches.  By defaul
 API_SYSEX_ENABLE = no       # This enables using the Quantum SYSEX API to send strings(+5390)
 KEY_LOCK_ENABLE = no        # This enables key lock(+260)
 SPLIT_KEYBOARD = no         # This enables split keyboard support and includes all necessary files located at quantum/split_common
+
--- a/keyboards/gonnerd/keymaps/mauin/rules.mk
+++ b/keyboards/gonnerd/keymaps/mauin/rules.mk
@ -16,6 +16,3 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend

-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
--- a/keyboards/gonnerd/keymaps/tkl/rules.mk
+++ b/keyboards/gonnerd/keymaps/tkl/rules.mk
@ -16,6 +16,3 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend

-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
--- a/keyboards/hadron/ver2/keymaps/side_numpad/rules.mk
+++ b/keyboards/hadron/ver2/keymaps/side_numpad/rules.mk
@ -21,6 +21,3 @@ SWAP_HANDS_ENABLE = no        # Enable one-hand typing
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend

-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
--- a/keyboards/handwired/atreus50/keymaps/ajp10304/rules.mk
+++ b/keyboards/handwired/atreus50/keymaps/ajp10304/rules.mk
@ -1,7 +1,3 @@
-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
-
 AUDIO_ENABLE = no
 MOUSEKEY_ENABLE = yes

--- a/keyboards/handwired/dactyl_manuform/4x5/keymaps/default/rules.mk
+++ b/keyboards/handwired/dactyl_manuform/4x5/keymaps/default/rules.mk
@ -1,3 +0,0 @@
-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
--- a/keyboards/handwired/dactyl_manuform/4x5/keymaps/dvorak/rules.mk
+++ b/keyboards/handwired/dactyl_manuform/4x5/keymaps/dvorak/rules.mk
@ -1,3 +0,0 @@
-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
--- a/keyboards/handwired/frenchdev/rules.mk
+++ b/keyboards/handwired/frenchdev/rules.mk
@ -87,6 +87,3 @@ AUDIO_ENABLE = no           # Audio output on port C6
 RGBLIGHT_ENABLE = no
 API_SYSEX_ENABLE = no

-#ifndef QUANTUM_DIR
-#	include ../../../Makefile
-#endif
--- a/keyboards/handwired/woodpad/keymaps/default/rules.mk
+++ b/keyboards/handwired/woodpad/keymaps/default/rules.mk
@ -32,6 +32,3 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend

-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
--- a/keyboards/handwired/woodpad/keymaps/drashna/rules.mk
+++ b/keyboards/handwired/woodpad/keymaps/drashna/rules.mk
@ -8,6 +8,3 @@ MOUSEKEY_ENABLE   = no

 EXTRAFLAGS        = -flto

-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
--- a/keyboards/helix/pico/keymaps/default/rules.mk
+++ b/keyboards/helix/pico/keymaps/default/rules.mk
@ -119,10 +119,6 @@ endif
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend

-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
-
 # Uncomment these for debugging
 # $(info -- RGBLIGHT_ENABLE=$(RGBLIGHT_ENABLE))
 # $(info -- OPT_DEFS=$(OPT_DEFS))
--- a/keyboards/helix/pico/keymaps/mtei/rules.mk
+++ b/keyboards/helix/pico/keymaps/mtei/rules.mk
@ -119,10 +119,6 @@ endif
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend

-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
-
 # Uncomment these for debugging
 # $(info -- RGBLIGHT_ENABLE=$(RGBLIGHT_ENABLE))
 # $(info -- OPT_DEFS=$(OPT_DEFS))
--- a/keyboards/helix/rev1/keymaps/default/rules.mk
+++ b/keyboards/helix/rev1/keymaps/default/rules.mk
@ -1,3 +0,0 @@
-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
--- a/keyboards/helix/rev2/keymaps/default/rules.mk
+++ b/keyboards/helix/rev2/keymaps/default/rules.mk
@ -118,10 +118,6 @@ endif
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend

-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
-
 # Uncomment these for debugging
 # $(info -- RGBLIGHT_ENABLE=$(RGBLIGHT_ENABLE))
 # $(info -- OPT_DEFS=$(OPT_DEFS))
--- a/keyboards/helix/rev2/keymaps/edvorakjp/rules.mk
+++ b/keyboards/helix/rev2/keymaps/edvorakjp/rules.mk
@ -121,10 +121,6 @@ endif
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend

-ifndef QUANTUM_DIR
-  include ../../../../Makefile
-endif
-
 # Uncomment these for debugging
 # $(info -- RGBLIGHT_ENABLE=$(RGBLIGHT_ENABLE))
 # $(info -- OPT_DEFS=$(OPT_DEFS))
--- a/keyboards/helix/rev2/keymaps/five_rows/rules.mk
+++ b/keyboards/helix/rev2/keymaps/five_rows/rules.mk
@ -125,10 +125,6 @@ endif
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend

-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
-
 # Uncomment these for debugging
 # $(info -- RGBLIGHT_ENABLE=$(RGBLIGHT_ENABLE))
 # $(info -- OPT_DEFS=$(OPT_DEFS))
--- a/keyboards/helix/rev2/keymaps/five_rows_jis/rules.mk
+++ b/keyboards/helix/rev2/keymaps/five_rows_jis/rules.mk
@ -118,10 +118,6 @@ endif
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend

-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
-
 # Uncomment these for debugging
 # $(info -- RGBLIGHT_ENABLE=$(RGBLIGHT_ENABLE))
 # $(info -- OPT_DEFS=$(OPT_DEFS))
--- a/keyboards/helix/rev2/keymaps/froggy/rules.mk
+++ b/keyboards/helix/rev2/keymaps/froggy/rules.mk
@ -118,10 +118,6 @@ endif
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend

-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
-
 # Uncomment these for debugging
 # $(info -- RGBLIGHT_ENABLE=$(RGBLIGHT_ENABLE))
 # $(info -- OPT_DEFS=$(OPT_DEFS))
--- a/keyboards/helix/rev2/keymaps/led_test/rules.mk
+++ b/keyboards/helix/rev2/keymaps/led_test/rules.mk
@ -120,10 +120,6 @@ SRC += led_test_init.c
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend

-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
-
 # Uncomment these for debugging
 # $(info -- RGBLIGHT_ENABLE=$(RGBLIGHT_ENABLE))
 # $(info -- OPT_DEFS=$(OPT_DEFS))
--- a/keyboards/hhkb/keymaps/cinaeco/rules.mk
+++ b/keyboards/hhkb/keymaps/cinaeco/rules.mk
@ -18,6 +18,3 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend

-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
--- a/keyboards/iris/keymaps/davidrambo/rules.mk
+++ b/keyboards/iris/keymaps/davidrambo/rules.mk
@ -2,6 +2,3 @@ RGBLIGHT_ENABLE = no
 BACKLIGHT_ENABLE = no
 TAP_DANCE_ENABLE = yes

-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
--- a/keyboards/iris/keymaps/dvp-zjpxshade/rules.mk
+++ b/keyboards/iris/keymaps/dvp-zjpxshade/rules.mk
@ -1,6 +1,3 @@
 RGBLIGHT_ENABLE = yes
 BACKLIGHT_ENABLE = yes

-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
--- a/keyboards/iris/keymaps/hag/rules.mk
+++ b/keyboards/iris/keymaps/hag/rules.mk
@ -1,6 +1,3 @@
 RGBLIGHT_ENABLE = yes
 BACKLIGHT_ENABLE = yes

-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
--- a/keyboards/iris/keymaps/hexwire/rules.mk
+++ b/keyboards/iris/keymaps/hexwire/rules.mk
@ -1,6 +1,3 @@
 RGBLIGHT_ENABLE = yes
 BACKLIGHT_ENABLE = yes

-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
--- a/keyboards/iris/keymaps/impstyle/rules.mk
+++ b/keyboards/iris/keymaps/impstyle/rules.mk
@ -3,6 +3,3 @@ BACKLIGHT_ENABLE = no
 TAP_DANCE_ENABLE = no
 MOUSEKEY_ENABLE = yes

-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
--- a/keyboards/iris/keymaps/krusli/rules.mk
+++ b/keyboards/iris/keymaps/krusli/rules.mk
@ -1,6 +1,3 @@
 RGBLIGHT_ENABLE = no
 BACKLIGHT_ENABLE = no

-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
--- a/keyboards/iris/keymaps/lewisridden/rules.mk
+++ b/keyboards/iris/keymaps/lewisridden/rules.mk
@ -1,6 +1,3 @@
 RGBLIGHT_ENABLE = yes
 BACKLIGHT_ENABLE = yes

-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
--- a/keyboards/iris/keymaps/mtdjr/rules.mk
+++ b/keyboards/iris/keymaps/mtdjr/rules.mk
@ -1,6 +1,4 @@
 RGBLIGHT_ENABLE = no
 BACKLIGHT_ENABLE = no
 #AUDIO_ENABLE = yes 
-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
+
--- a/keyboards/iris/keymaps/rdhaene/rules.mk
+++ b/keyboards/iris/keymaps/rdhaene/rules.mk
@ -1,6 +1,3 @@
 RGBLIGHT_ENABLE = no
 BACKLIGHT_ENABLE = yes

-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
--- a/keyboards/iris/keymaps/swedish/rules.mk
+++ b/keyboards/iris/keymaps/swedish/rules.mk
@ -1,6 +1,3 @@
 RGBLIGHT_ENABLE = yes
 BACKLIGHT_ENABLE = yes

-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
--- a/keyboards/iris/keymaps/transmogrified/rules.mk
+++ b/keyboards/iris/keymaps/transmogrified/rules.mk
@ -1,6 +1,3 @@
 BACKLIGHT_ENABLE = yes
 TAP_DANCE_ENABLE = yes

-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
--- a/keyboards/iris/keymaps/yanfali/rules.mk
+++ b/keyboards/iris/keymaps/yanfali/rules.mk
@ -1,6 +1,3 @@
 RGBLIGHT_ENABLE = yes
 BACKLIGHT_ENABLE = yes

-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
--- a/keyboards/jc65/v32u4/keymaps/gam3cat/rules.mk
+++ b/keyboards/jc65/v32u4/keymaps/gam3cat/rules.mk
@ -22,3 +22,4 @@ FAUXCLICKY_ENABLE = no      # Uses buzzer to emulate clicky switches.  By defaul
 API_SYSEX_ENABLE = no       # This enables using the Quantum SYSEX API to send strings(+5390)
 KEY_LOCK_ENABLE = no        # This enables key lock(+260)
 SPLIT_KEYBOARD = no         # This enables split keyboard support and includes all necessary files located at quantum/split_common
+
--- a/keyboards/jd40/keymaps/vanagon/rules.mk
+++ b/keyboards/jd40/keymaps/vanagon/rules.mk
@ -1,3 +0,0 @@
-ifndef QUANTUM_DIR
-        include ../../../../Makefile
-endif
--- a/keyboards/jd45/keymaps/mjt6u/rules.mk
+++ b/keyboards/jd45/keymaps/mjt6u/rules.mk
@ -18,6 +18,3 @@ SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend

 DEBUG_ENABLE = yes

-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
--- a/keyboards/jj40/keymaps/ajp10304/rules.mk
+++ b/keyboards/jj40/keymaps/ajp10304/rules.mk
@ -1,6 +1,3 @@
-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
-
 AUDIO_ENABLE = no
 MOUSEKEY_ENABLE = yes
+
--- a/keyboards/jj40/keymaps/fun40/rules.mk
+++ b/keyboards/jj40/keymaps/fun40/rules.mk
@ -19,6 +19,3 @@ DISABLE_WS2812 = yes

 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend

-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
--- a/keyboards/jj50/rules.mk
+++ b/keyboards/jj50/rules.mk
@ -57,10 +57,6 @@ SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
 CUSTOM_MATRIX = yes
 SRC = matrix.c i2c.c backlight.c

-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
-
 # programming options
 PROGRAM_CMD = ./keyboards/ps2avrGB/program $(TARGET).hex

--- a/keyboards/kc60/keymaps/stanleylai/rules.mk
+++ b/keyboards/kc60/keymaps/stanleylai/rules.mk
@ -20,6 +20,3 @@ SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
 # if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
 NKRO_ENABLE = yes           # USB Nkey Rollover

-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
--- a/keyboards/kc60/keymaps/wigguno/rules.mk
+++ b/keyboards/kc60/keymaps/wigguno/rules.mk
@ -19,6 +19,3 @@ UNICODE_ENABLE = no         # Unicode
 BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 AUDIO_ENABLE = no           # Audio output on port C6

-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
--- a/keyboards/kc60/keymaps/ws2812/rules.mk
+++ b/keyboards/kc60/keymaps/ws2812/rules.mk
@ -20,6 +20,3 @@ SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
 # if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
 NKRO_ENABLE = no            # USB Nkey Rollover

-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
--- a/keyboards/kinesis/keymaps/carpalx/rules.mk
+++ b/keyboards/kinesis/keymaps/carpalx/rules.mk
@ -16,6 +16,3 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend

-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
--- a/keyboards/kinesis/keymaps/default/rules.mk
+++ b/keyboards/kinesis/keymaps/default/rules.mk
@ -16,6 +16,3 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend

-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
--- a/keyboards/kinesis/keymaps/default_pretty/rules.mk
+++ b/keyboards/kinesis/keymaps/default_pretty/rules.mk
@ -16,6 +16,3 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend

-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
--- a/keyboards/kinesis/keymaps/dvorak/rules.mk
+++ b/keyboards/kinesis/keymaps/dvorak/rules.mk
@ -16,6 +16,3 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend

-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
--- a/keyboards/kinesis/keymaps/insertsnideremarks/rules.mk
+++ b/keyboards/kinesis/keymaps/insertsnideremarks/rules.mk
@ -19,6 +19,3 @@ RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
 TAP_DANCE_ENABLE = yes      # Enable Tap Dancing function

-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
--- a/keyboards/kinesis/keymaps/milestogo/rules.mk
+++ b/keyboards/kinesis/keymaps/milestogo/rules.mk
@ -16,6 +16,3 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend

-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
--- a/keyboards/kinesis/keymaps/xyverz/rules.mk
+++ b/keyboards/kinesis/keymaps/xyverz/rules.mk
@ -16,6 +16,3 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend

-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
--- a/keyboards/kmac/keymaps/default/rules.mk
+++ b/keyboards/kmac/keymaps/default/rules.mk
@ -32,6 +32,3 @@ 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.
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend

-ifndef QUANTUM_DIR
-    include ../../../../Makefile
-endif
--- a/keyboards/kmac/keymaps/winkeyless/rules.mk
+++ b/keyboards/kmac/keymaps/winkeyless/rules.mk
@ -32,6 +32,3 @@ 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.
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend

-ifndef QUANTUM_DIR
-    include ../../../../Makefile
-endif
--- a/keyboards/kona_classic/keymaps/ansi/rules.mk
+++ b/keyboards/kona_classic/keymaps/ansi/rules.mk
@ -32,6 +32,3 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight. Do not enable this with audio at the same time.
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend

-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
--- a/keyboards/kona_classic/keymaps/ansi_arrows/rules.mk
+++ b/keyboards/kona_classic/keymaps/ansi_arrows/rules.mk
@ -32,6 +32,3 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight. Do not enable this with audio at the same time.
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend

-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
--- a/keyboards/kona_classic/keymaps/ansi_arrows_lcap/rules.mk
+++ b/keyboards/kona_classic/keymaps/ansi_arrows_lcap/rules.mk
@ -32,6 +32,3 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight. Do not enable this with audio at the same time.
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend

-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
--- a/keyboards/kona_classic/keymaps/ansi_split/rules.mk
+++ b/keyboards/kona_classic/keymaps/ansi_split/rules.mk
@ -32,6 +32,3 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight. Do not enable this with audio at the same time.
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend

-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
--- a/keyboards/kona_classic/keymaps/ansi_split_arrows/rules.mk
+++ b/keyboards/kona_classic/keymaps/ansi_split_arrows/rules.mk
@ -32,6 +32,3 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight. Do not enable this with audio at the same time.
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend

-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
--- a/keyboards/kona_classic/keymaps/default/rules.mk
+++ b/keyboards/kona_classic/keymaps/default/rules.mk
@ -32,6 +32,3 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight. Do not enable this with audio at the same time.
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend

-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
--- a/keyboards/kona_classic/keymaps/iso/rules.mk
+++ b/keyboards/kona_classic/keymaps/iso/rules.mk
@ -32,6 +32,3 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight. Do not enable this with audio at the same time.
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend

-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
--- a/keyboards/kona_classic/keymaps/iso_arrows/rules.mk
+++ b/keyboards/kona_classic/keymaps/iso_arrows/rules.mk
@ -32,6 +32,3 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight. Do not enable this with audio at the same time.
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend

-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
--- a/keyboards/kona_classic/keymaps/iso_split/rules.mk
+++ b/keyboards/kona_classic/keymaps/iso_split/rules.mk
@ -32,6 +32,3 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight. Do not enable this with audio at the same time.
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend

-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
--- a/keyboards/kona_classic/keymaps/iso_split_arrows/rules.mk
+++ b/keyboards/kona_classic/keymaps/iso_split_arrows/rules.mk
@ -32,6 +32,3 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight. Do not enable this with audio at the same time.
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend

-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
--- a/keyboards/laplace/keymaps/bakingpy/rules.mk
+++ b/keyboards/laplace/keymaps/bakingpy/rules.mk
@ -1,3 +0,0 @@
-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
--- a/keyboards/laplace/keymaps/default/rules.mk
+++ b/keyboards/laplace/keymaps/default/rules.mk
@ -1,3 +0,0 @@
-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
--- a/keyboards/launchpad/keymaps/default/rules.mk
+++ b/keyboards/launchpad/keymaps/default/rules.mk
@ -20,6 +20,3 @@ RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend

-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
--- a/keyboards/lets_split/keymaps/bbaserdem/rules.mk
+++ b/keyboards/lets_split/keymaps/bbaserdem/rules.mk
@ -6,6 +6,3 @@ RGBLIGHT_ENABLE = yes 		# LED strips
 TAP_DANCE_ENABLE = no 		# Use multi-tap features
 AUDIO_ENABLE = no 			# Audio stuff

-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
--- a/keyboards/lets_split/keymaps/bbaserdem_right/rules.mk
+++ b/keyboards/lets_split/keymaps/bbaserdem_right/rules.mk
@ -21,6 +21,3 @@ KEY_LOCK_ENABLE = no 		# Allows locking any key. Not used
 UNICODE_ENABLE = no			# Used for unicode character emulation
 EXTRAKEY_ENABLE = no		# OS signals like volume control

-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
--- a/keyboards/lets_split/keymaps/cpeters1982/rules.mk
+++ b/keyboards/lets_split/keymaps/cpeters1982/rules.mk
@ -1,8 +1,3 @@
+AUTO_SHIFT_ENABLE = yes
+RGBLIGHT_ENABLE = yes

-
-
-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-  AUTO_SHIFT_ENABLE = yes
-  RGBLIGHT_ENABLE = yes
-endif
--- a/keyboards/lets_split/keymaps/fabian/rules.mk
+++ b/keyboards/lets_split/keymaps/fabian/rules.mk
@ -4,6 +4,3 @@
 #
 # UNICODE_ENABLE = yes

-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
--- a/keyboards/lets_split/keymaps/heartrobotninja/rules.mk
+++ b/keyboards/lets_split/keymaps/heartrobotninja/rules.mk
@ -20,6 +20,3 @@ SWAP_HANDS_ENABLE = no        # Enable one-hand typing
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend

-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
--- a/keyboards/lets_split/keymaps/khord/rules.mk
+++ b/keyboards/lets_split/keymaps/khord/rules.mk
@ -2,6 +2,3 @@ TAP_DANCE_ENABLE = yes
 RGBLIGHT_ENABLE = yes
 USE_I2C = no

-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
--- a/Show more
+++ b/Show more