summaryrefslogtreecommitdiff
path: root/keyboards/contra
diff options
context:
space:
mode:
authorAlex Ong <the.onga@gmail.com>2019-01-26 11:36:28 +1100
committerAlex Ong <the.onga@gmail.com>2019-01-26 11:36:28 +1100
commitd977daa8dc9136746425f9e1414e1f93cb161877 (patch)
tree209ab8082580e5fdf37f1a8b7c1169250b7548c0 /keyboards/contra
parent47c91fc7f75ae0a477e55b687aa0fc30da0a283c (diff)
parent0306e487e2cd6a77ad840d0a441b478747b7ccd0 (diff)
downloadqmk_firmware-d977daa8dc9136746425f9e1414e1f93cb161877.tar.gz
qmk_firmware-d977daa8dc9136746425f9e1414e1f93cb161877.zip
Merge branch 'master' of https://github.com/qmk/qmk_firmware
Diffstat (limited to 'keyboards/contra')
-rw-r--r--keyboards/contra/keymaps/dana/rules.mk3
-rw-r--r--keyboards/contra/keymaps/losinggeneration/rules.mk3
-rw-r--r--keyboards/contra/keymaps/maxr1998/rules.mk3
-rw-r--r--keyboards/contra/readme.md2
4 files changed, 1 insertions, 10 deletions
diff --git a/keyboards/contra/keymaps/dana/rules.mk b/keyboards/contra/keymaps/dana/rules.mk
index 1198f378a8..cf891fad35 100644
--- 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
diff --git a/keyboards/contra/keymaps/losinggeneration/rules.mk b/keyboards/contra/keymaps/losinggeneration/rules.mk
index ea2b7165d9..17ef684830 100644
--- 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
diff --git a/keyboards/contra/keymaps/maxr1998/rules.mk b/keyboards/contra/keymaps/maxr1998/rules.mk
index 75a476114f..e1ba074290 100644
--- 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
diff --git a/keyboards/contra/readme.md b/keyboards/contra/readme.md
index c1915a811d..f16598581e 100644
--- a/keyboards/contra/readme.md
+++ b/keyboards/contra/readme.md
@@ -13,4 +13,4 @@ Make example for this keyboard (after setting up your build environment):
make contra:dana
-See [build environment setup](https://docs.qmk.fm/build_environment_setup.html) then the [make instructions](https://docs.qmk.fm/make_instructions.html) for more information.
+See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information.