Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #691 from fredizzimo/fix_line_endings | Jack Humbert | 2016-08-27 | 40 | -6251/+6252 |
|\ | | | | | Fix line endings | ||||
| * | Merge branch 'master' into fix_line_endings | Fred Sundvik | 2016-08-27 | 115 | -3306/+3664 |
| |\ | |/ |/| | |||||
* | | Merge pull request #666 from fredizzimo/makefile_overhaul | Jack Humbert | 2016-08-27 | 115 | -3308/+3666 |
|\ \ | | | | | | | Makefile overhaul | ||||
| * | | Fix travis_compiled_push | Fred Sundvik | 2016-08-27 | 1 | -2/+2 |
| | | | |||||
| * | | Merge remote-tracking branch 'upstream/master' into makefile_overhaul | Fred Sundvik | 2016-08-26 | 2 | -25/+144 |
| |\ \ | |/ / |/| | | |||||
| * | | Fix bad merge | Fred Sundvik | 2016-08-26 | 2 | -4/+2 |
| | | | | | | | | | | | | Led should have been added to KC60, not GH60 | ||||
| * | | Remove google test submodule | Fred Sundvik | 2016-08-25 | 1 | -0/+0 |
| | | | | | | | | | | | | | | | It had been added for some strange reason, allthough it's supposed to be there only in another branch. | ||||
| * | | Split vision_division into Makefile/rules.mk | Fred Sundvik | 2016-08-25 | 2 | -75/+72 |
| | | | |||||
| * | | Merge branch 'master' into makefile_overhaul | Fred Sundvik | 2016-08-25 | 55 | -336/+2855 |
| |\ \ | |||||
| * \ \ | Merge remote-tracking branch 'upstream/master' into makefile_overhaul | Fred Sundvik | 2016-08-24 | 9 | -4/+695 |
| |\ \ \ | |||||
| * | | | | Fix slight inconsistency | Fred Sundvik | 2016-08-24 | 1 | -13/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When running make from either a keyboard folder or a subproject it runs all keymaps for all subprojects and the selected subproject respectively. Without this fix, the same doesn't happen if your run make clean for example. As it would just provide you with an error message. Now this will work as expected. | ||||
| * | | | | Split kitten_paw into Makefile/rules.mk | Fred Sundvik | 2016-08-23 | 2 | -75/+73 |
| | | | | | |||||
| * | | | | Merge branch 'master' into makefile_overhaul | Fred Sundvik | 2016-08-23 | 67 | -2662/+3797 |
| |\ \ \ \ | |||||
| * | | | | | Change order of variable assignment | Fred Sundvik | 2016-08-21 | 1 | -9/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUILD_DIR and TARGET was assigned too late, so the dfu-util target, which depends on them did not work. | ||||
| * | | | | | Add longest match to the rule-checking | Fred Sundvik | 2016-08-21 | 1 | -2/+41 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes cases where you have several keyboards with a common prefix, like algernon, and algernon-master | ||||
| * | | | | | Comment the Makefile | Fred Sundvik | 2016-08-20 | 2 | -18/+124 |
| | | | | | | | | | | | | | | | | | | | | | | | | Also move some messages to message.mk | ||||
| * | | | | | Fix the clean target | Fred Sundvik | 2016-08-20 | 1 | -2/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | It now properly cleans all the outputs | ||||
| * | | | | | Update keyboard readme files with new makefile instructions | Fred Sundvik | 2016-08-20 | 16 | -58/+75 |
| | | | | | | |||||
| * | | | | | Update readme with new instructions for make | Fred Sundvik | 2016-08-20 | 1 | -21/+81 |
| | | | | | | |||||
| * | | | | | Add diffutils to travis.yml and install_dependencies | Fred Sundvik | 2016-08-20 | 2 | -4/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It has been required for a while now, and now actually checked in the makefiles. Before, if you didn't have it installed it would just recompile everything. The readme hasn't been updated to reflect this, I think we need to go through that separately, and see what's really needed. Or just instruct people to run the batch scripts. | ||||
| * | | | | | Fix the template for the Makefile/rules.mk split | Fred Sundvik | 2016-08-20 | 2 | -74/+69 |
| | | | | | | |||||
| * | | | | | Better format for non-silent output | Fred Sundvik | 2016-08-20 | 1 | -2/+1 |
| | | | | | | |||||
| * | | | | | Continue on error | Fred Sundvik | 2016-08-20 | 2 | -3/+10 |
| | | | | | | |||||
| * | | | | | Move bootloader_defs include to build_keyboard | Fred Sundvik | 2016-08-20 | 2 | -8/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | Also fix it for subprojects | ||||
| * | | | | | Add output specific config file | Fred Sundvik | 2016-08-20 | 2 | -21/+16 |
| | | | | | | |||||
| * | | | | | Output specific include paths | Fred Sundvik | 2016-08-20 | 2 | -27/+22 |
| | | | | | | |||||
| * | | | | | More general system for generating several outputs | Fred Sundvik | 2016-08-20 | 4 | -104/+98 |
| | | | | | | |||||
| * | | | | | Pass the target to submake | Fred Sundvik | 2016-08-20 | 1 | -2/+8 |
| | | | | | | |||||
| * | | | | | Fix variable name clash with builtin | Fred Sundvik | 2016-08-20 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This caused the submake to be called several times, messing up the build. | ||||
| * | | | | | Options for silent compilation | Fred Sundvik | 2016-08-20 | 2 | -16/+38 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A single keyboard is always by default compiled in verbose mode. While multiple keyboards are compiled in silent mode. This can be overriden by the silent variable from the command line | ||||
| * | | | | | Don't run builtin rules for submake | Fred Sundvik | 2016-08-20 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | To speed up the compilation | ||||
| * | | | | | Fix running make in parallel | Fred Sundvik | 2016-08-20 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Don't add VERSION as a define | Fred Sundvik | 2016-08-20 | 2 | -4/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | To avoid full recompilation when the git commit hash changes. | ||||
| * | | | | | Move git submodule check and version generation to main Makefile | Fred Sundvik | 2016-08-20 | 3 | -16/+14 |
| | | | | | | |||||
| * | | | | | Remove unneded code from tmk_core/rules.mk | Fred Sundvik | 2016-08-20 | 2 | -90/+5 |
| | | | | | | |||||
| * | | | | | Actual compilation | Fred Sundvik | 2016-08-20 | 3 | -141/+59 |
| | | | | | | |||||
| * | | | | | Add color output | Fred Sundvik | 2016-08-20 | 2 | -3/+65 |
| | | | | | | |||||
| * | | | | | Fix running make from various subfolders | Fred Sundvik | 2016-08-20 | 1 | -14/+12 |
| | | | | | | |||||
| * | | | | | Fixed the shortcut targets | Fred Sundvik | 2016-08-20 | 1 | -4/+4 |
| | | | | | | |||||
| * | | | | | Proper default goals when inside keyboard fodlers | Fred Sundvik | 2016-08-20 | 1 | -4/+19 |
| | | | | | | |||||
| * | | | | | Add backwards compability with makefile variables | Fred Sundvik | 2016-08-20 | 1 | -0/+14 |
| | | | | | | |||||
| * | | | | | Proper handling for running make from a subproject or keymap dir | Fred Sundvik | 2016-08-20 | 1 | -0/+9 |
| | | | | | | |||||
| * | | | | | Split subproject make files into Makefile and rules.mk | Fred Sundvik | 2016-08-20 | 28 | -605/+705 |
| | | | | | | |||||
| * | | | | | Support for running from keyboard directory | Fred Sundvik | 2016-08-20 | 1 | -1/+3 |
| | | | | | | |||||
| * | | | | | Print error when building non-existing keyboard | Fred Sundvik | 2016-08-20 | 1 | -0/+3 |
| | | | | | | |||||
| * | | | | | Print error message when trying to build non-existing keymap | Fred Sundvik | 2016-08-20 | 1 | -1/+9 |
| | | | | | | |||||
| * | | | | | Proper parsing of keymaps inside subprojects | Fred Sundvik | 2016-08-20 | 1 | -5/+21 |
| | | | | | | |||||
| * | | | | | Split keyboard makefiles into rules and Makefile | Fred Sundvik | 2016-08-20 | 56 | -1903/+1792 |
| | | | | | | |||||
| * | | | | | Add default subproject parsing | Fred Sundvik | 2016-08-20 | 1 | -2/+15 |
| | | | | | | |||||
| * | | | | | Slight rearrange of the Makefile for easier readability | Fred Sundvik | 2016-08-20 | 1 | -27/+27 |
| | | | | | |