aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #691 from fredizzimo/fix_line_endingsJack Humbert2016-08-2740-6251/+6252
|\ | | | | Fix line endings
| * Merge branch 'master' into fix_line_endingsFred Sundvik2016-08-27115-3306/+3664
| |\ | |/ |/|
* | Merge pull request #666 from fredizzimo/makefile_overhaulJack Humbert2016-08-27115-3308/+3666
|\ \ | | | | | | Makefile overhaul
| * | Fix travis_compiled_pushFred Sundvik2016-08-271-2/+2
| | |
| * | Merge remote-tracking branch 'upstream/master' into makefile_overhaulFred Sundvik2016-08-262-25/+144
| |\ \ | |/ / |/| |
| * | Fix bad mergeFred Sundvik2016-08-262-4/+2
| | | | | | | | | | | | Led should have been added to KC60, not GH60
| * | Remove google test submoduleFred Sundvik2016-08-251-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.mkFred Sundvik2016-08-252-75/+72
| | |
| * | Merge branch 'master' into makefile_overhaulFred Sundvik2016-08-2555-336/+2855
| |\ \
| * \ \ Merge remote-tracking branch 'upstream/master' into makefile_overhaulFred Sundvik2016-08-249-4/+695
| |\ \ \
| * | | | Fix slight inconsistencyFred Sundvik2016-08-241-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.mkFred Sundvik2016-08-232-75/+73
| | | | |
| * | | | Merge branch 'master' into makefile_overhaulFred Sundvik2016-08-2367-2662/+3797
| |\ \ \ \
| * | | | | Change order of variable assignmentFred Sundvik2016-08-211-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-checkingFred Sundvik2016-08-211-2/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes cases where you have several keyboards with a common prefix, like algernon, and algernon-master
| * | | | | Comment the MakefileFred Sundvik2016-08-202-18/+124
| | | | | | | | | | | | | | | | | | | | | | | | Also move some messages to message.mk
| * | | | | Fix the clean targetFred Sundvik2016-08-201-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | It now properly cleans all the outputs
| * | | | | Update keyboard readme files with new makefile instructionsFred Sundvik2016-08-2016-58/+75
| | | | | |
| * | | | | Update readme with new instructions for makeFred Sundvik2016-08-201-21/+81
| | | | | |
| * | | | | Add diffutils to travis.yml and install_dependenciesFred Sundvik2016-08-202-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 splitFred Sundvik2016-08-202-74/+69
| | | | | |
| * | | | | Better format for non-silent outputFred Sundvik2016-08-201-2/+1
| | | | | |
| * | | | | Continue on errorFred Sundvik2016-08-202-3/+10
| | | | | |
| * | | | | Move bootloader_defs include to build_keyboardFred Sundvik2016-08-202-8/+9
| | | | | | | | | | | | | | | | | | | | | | | | Also fix it for subprojects
| * | | | | Add output specific config fileFred Sundvik2016-08-202-21/+16
| | | | | |
| * | | | | Output specific include pathsFred Sundvik2016-08-202-27/+22
| | | | | |
| * | | | | More general system for generating several outputsFred Sundvik2016-08-204-104/+98
| | | | | |
| * | | | | Pass the target to submakeFred Sundvik2016-08-201-2/+8
| | | | | |
| * | | | | Fix variable name clash with builtinFred Sundvik2016-08-201-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This caused the submake to be called several times, messing up the build.
| * | | | | Options for silent compilationFred Sundvik2016-08-202-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 submakeFred Sundvik2016-08-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | To speed up the compilation
| * | | | | Fix running make in parallelFred Sundvik2016-08-201-1/+1
| | | | | |
| * | | | | Don't add VERSION as a defineFred Sundvik2016-08-202-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | To avoid full recompilation when the git commit hash changes.
| * | | | | Move git submodule check and version generation to main MakefileFred Sundvik2016-08-203-16/+14
| | | | | |
| * | | | | Remove unneded code from tmk_core/rules.mkFred Sundvik2016-08-202-90/+5
| | | | | |
| * | | | | Actual compilationFred Sundvik2016-08-203-141/+59
| | | | | |
| * | | | | Add color outputFred Sundvik2016-08-202-3/+65
| | | | | |
| * | | | | Fix running make from various subfoldersFred Sundvik2016-08-201-14/+12
| | | | | |
| * | | | | Fixed the shortcut targetsFred Sundvik2016-08-201-4/+4
| | | | | |
| * | | | | Proper default goals when inside keyboard fodlersFred Sundvik2016-08-201-4/+19
| | | | | |
| * | | | | Add backwards compability with makefile variablesFred Sundvik2016-08-201-0/+14
| | | | | |
| * | | | | Proper handling for running make from a subproject or keymap dirFred Sundvik2016-08-201-0/+9
| | | | | |
| * | | | | Split subproject make files into Makefile and rules.mkFred Sundvik2016-08-2028-605/+705
| | | | | |
| * | | | | Support for running from keyboard directoryFred Sundvik2016-08-201-1/+3
| | | | | |
| * | | | | Print error when building non-existing keyboardFred Sundvik2016-08-201-0/+3
| | | | | |
| * | | | | Print error message when trying to build non-existing keymapFred Sundvik2016-08-201-1/+9
| | | | | |
| * | | | | Proper parsing of keymaps inside subprojectsFred Sundvik2016-08-201-5/+21
| | | | | |
| * | | | | Split keyboard makefiles into rules and MakefileFred Sundvik2016-08-2056-1903/+1792
| | | | | |
| * | | | | Add default subproject parsingFred Sundvik2016-08-201-2/+15
| | | | | |
| * | | | | Slight rearrange of the Makefile for easier readabilityFred Sundvik2016-08-201-27/+27
| | | | | |