diff options
author | That-Canadian <poole.chris.11@gmail.com> | 2017-08-03 10:52:30 -0400 |
---|---|---|
committer | That-Canadian <poole.chris.11@gmail.com> | 2017-08-03 10:52:30 -0400 |
commit | c33434c0d64dd7cbd5f6371c7cb4ac5e05924944 (patch) | |
tree | 59fe34d95089a59fa4e615fd995c81d274147bba /docs/make_instructions.md | |
parent | db5bb7dbbfa2d2eb4f41aa4c768c3c5c8d73f563 (diff) | |
parent | 07ba06d0b6e516bcfa4cbccbed9cfd8dc131072a (diff) |
Merge branch 'master' into eco-keyboard
Diffstat (limited to 'docs/make_instructions.md')
-rw-r--r-- | docs/make_instructions.md | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/make_instructions.md b/docs/make_instructions.md index 6f88f91069..64c1cb0f00 100644 --- a/docs/make_instructions.md +++ b/docs/make_instructions.md @@ -48,7 +48,7 @@ Here are some examples commands * `make ergodox-infinity-algernon-clean` will clean the build output of the Ergodox Infinity keyboard. This example uses the full syntax and can be run from any folder with a `Makefile` * `make dfu COLOR=false` from within a keymap folder, builds and uploads the keymap, but without color output. -## The `Makefile` +# The `Makefile` There are 5 different `make` and `Makefile` locations: @@ -62,7 +62,7 @@ The root contains the code used to automatically figure out which keymap or keym For keyboards and subprojects, the make files are split in two parts `Makefile` and `rules.mk`. All settings can be found in the `rules.mk` file, while the `Makefile` is just there for support and including the root `Makefile`. Keymaps contain just one `Makefile` for simplicity. -### Makefile options +## Makefile options Set these variables to `no` to disable them, and `yes` to enable them. @@ -158,7 +158,7 @@ This enables using the Quantum SYSEX API to send strings (somewhere?) This consumes about 5390 bytes. -### Customizing Makefile options on a per-keymap basis +## Customizing Makefile options on a per-keymap basis If your keymap directory has a file called `Makefile` (note the filename), any Makefile options you set in that file will take precedence over other Makefile options for your particular keyboard. |