summaryrefslogtreecommitdiff
path: root/readme.md
diff options
context:
space:
mode:
authorJoshua T <joshua@sonofone.net>2016-08-07 23:28:59 -0500
committerJoshua T <joshua@sonofone.net>2016-08-07 23:28:59 -0500
commit6df31120a1904ee1330787701d4bcb84c4c72390 (patch)
treeb0fb3ccd691c17240442271f12c5af2ba9843295 /readme.md
parentcf795a6f93a541c2ff5d64daa0aefd1f97d62035 (diff)
parent213cb2c24306e198e717fc162806201567666f36 (diff)
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'readme.md')
-rw-r--r--readme.md7
1 files changed, 3 insertions, 4 deletions
diff --git a/readme.md b/readme.md
index c3d866f36b..57629f8be2 100644
--- a/readme.md
+++ b/readme.md
@@ -122,17 +122,16 @@ Below are some definitions that will be useful:
Below is a list of the useful `make` commands in QMK:
-* `make` - cleans automatically and builds your keyboard and keymap depending on which folder you're in. This defaults to the "default" layout (unless in a keymap folder), and Planck keyboard in the root folder
+* `make` - builds your keyboard and keymap depending on which folder you're in. This defaults to the "default" layout (unless in a keymap folder), and Planck keyboard in the root folder
* `make keyboard=<keyboard>` - specifies the keyboard (only to be used in root)
* `make keymap=<keymap>` - specifies the keymap (only to be used in root and keyboard folder - not needed when in keymap folder)
-* `make quick` - skips the clean step (cannot be used immediately after modifying config.h or Makefiles)
+* `make clean` - cleans the `.build` folder, ensuring that everything is re-built
* `make dfu` - (requires dfu-programmer) builds and flashes the keymap to your keyboard once placed in reset/dfu mode (button or press `KC_RESET`). This does not work for Teensy-based keyboards like the ErgoDox EZ.
* `keyboard=` and `keymap=` are compatible with this
* `make all-keyboards` - builds all keymaps for all keyboards and outputs status of each (use in root)
* `make all-keyboards-default` - builds all default keymaps for all keyboards and outputs status of each (use in root)
* `make all-keymaps [keyboard=<keyboard>]` - builds all of the keymaps for whatever keyboard folder you're in, or specified by `<keyboard>`
-* `make all-keyboards-quick`, `make all-keyboards-default-quick` and `make all-keymaps-quick [keyboard=<keyboard>]` - like the normal "make-all-*" commands, but they skip the clean steps
-
+* `make all-keyboards-*`, `make all-keyboards-default-*` and `make all-keymaps-* [keyboard=<keyboard>]` - like the normal "make-all-*" commands, but the last string aftter the `-` (for example clean) is passed to the keyboard make command.
Other, less useful functionality:
* `make COLOR=false` - turns off color output