Sean Reifschneider 
							
						 
					 
					
						
						
						
						
							
						
						
							d98e5ddf30 
							
						 
					 
					
						
						
							
							Tweaks after review.  
						
						
						
						
					 
					
						2016-08-19 21:50:04 -06:00 
						 
				 
			
				
					
						
							
							
								Sean Reifschneider 
							
						 
					 
					
						
						
						
						
							
						
						
							9e03517ae5 
							
						 
					 
					
						
						
							
							Restructuring of the ergodox README.  
						
						
						
						
					 
					
						2016-08-19 21:47:00 -06:00 
						 
				 
			
				
					
						
							
							
								Sean Reifschneider 
							
						 
					 
					
						
						
						
						
							
						
						
							a25480b3b5 
							
						 
					 
					
						
						
							
							Bringing over changes from default map.  
						
						
						
						
					 
					
						2016-08-19 20:55:50 -06:00 
						 
				 
			
				
					
						
							
							
								Fred Sundvik 
							
						 
					 
					
						
						
						
						
							
						
						
							da226e6126 
							
						 
					 
					
						
						
							
							Update keyboard readme files with new makefile instructions  
						
						
						
						
					 
					
						2016-08-20 03:56:48 +03:00 
						 
				 
			
				
					
						
							
							
								Fred Sundvik 
							
						 
					 
					
						
						
						
						
							
						
						
							b4c75569b0 
							
						 
					 
					
						
						
							
							Update readme with new instructions for make  
						
						
						
						
					 
					
						2016-08-20 03:56:47 +03:00 
						 
				 
			
				
					
						
							
							
								Fred Sundvik 
							
						 
					 
					
						
						
						
						
							
						
						
							e1243339ca 
							
						 
					 
					
						
						
							
							Add diffutils to travis.yml and install_dependencies  
						
						... 
						
						
						
						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. 
						
						
					 
					
						2016-08-20 03:56:46 +03:00 
						 
				 
			
				
					
						
							
							
								Fred Sundvik 
							
						 
					 
					
						
						
						
						
							
						
						
							ab4d7adbb9 
							
						 
					 
					
						
						
							
							Fix the template for the Makefile/rules.mk split  
						
						
						
						
					 
					
						2016-08-20 03:56:45 +03:00 
						 
				 
			
				
					
						
							
							
								Fred Sundvik 
							
						 
					 
					
						
						
						
						
							
						
						
							f29730da36 
							
						 
					 
					
						
						
							
							Better format for non-silent output  
						
						
						
						
					 
					
						2016-08-20 03:56:44 +03:00 
						 
				 
			
				
					
						
							
							
								Fred Sundvik 
							
						 
					 
					
						
						
						
						
							
						
						
							03e31ef8b9 
							
						 
					 
					
						
						
							
							Continue on error  
						
						
						
						
					 
					
						2016-08-20 03:56:43 +03:00 
						 
				 
			
				
					
						
							
							
								Fred Sundvik 
							
						 
					 
					
						
						
						
						
							
						
						
							3442e216dc 
							
						 
					 
					
						
						
							
							Move bootloader_defs include to build_keyboard  
						
						... 
						
						
						
						Also fix it for subprojects 
						
						
					 
					
						2016-08-20 03:56:42 +03:00 
						 
				 
			
				
					
						
							
							
								Fred Sundvik 
							
						 
					 
					
						
						
						
						
							
						
						
							9028a412ea 
							
						 
					 
					
						
						
							
							Add output specific config file  
						
						
						
						
					 
					
						2016-08-20 03:56:41 +03:00 
						 
				 
			
				
					
						
							
							
								Fred Sundvik 
							
						 
					 
					
						
						
						
						
							
						
						
							33fbd3be36 
							
						 
					 
					
						
						
							
							Output specific include paths  
						
						
						
						
					 
					
						2016-08-20 03:56:40 +03:00 
						 
				 
			
				
					
						
							
							
								Fred Sundvik 
							
						 
					 
					
						
						
						
						
							
						
						
							3aac4e95c9 
							
						 
					 
					
						
						
							
							More general system for generating several outputs  
						
						
						
						
					 
					
						2016-08-20 03:56:39 +03:00 
						 
				 
			
				
					
						
							
							
								Fred Sundvik 
							
						 
					 
					
						
						
						
						
							
						
						
							87bf34a5d3 
							
						 
					 
					
						
						
							
							Pass the target to submake  
						
						
						
						
					 
					
						2016-08-20 03:56:38 +03:00 
						 
				 
			
				
					
						
							
							
								Fred Sundvik 
							
						 
					 
					
						
						
						
						
							
						
						
							d924eb591e 
							
						 
					 
					
						
						
							
							Fix variable name clash with builtin  
						
						... 
						
						
						
						This caused the submake to be called several times, messing up the
build. 
						
						
					 
					
						2016-08-20 03:56:37 +03:00 
						 
				 
			
				
					
						
							
							
								Fred Sundvik 
							
						 
					 
					
						
						
						
						
							
						
						
							8732265928 
							
						 
					 
					
						
						
							
							Options for silent compilation  
						
						... 
						
						
						
						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 
						
						
					 
					
						2016-08-20 03:56:36 +03:00 
						 
				 
			
				
					
						
							
							
								Fred Sundvik 
							
						 
					 
					
						
						
						
						
							
						
						
							e4c842de02 
							
						 
					 
					
						
						
							
							Don't run builtin rules for submake  
						
						... 
						
						
						
						To speed up the compilation 
						
						
					 
					
						2016-08-20 03:56:35 +03:00 
						 
				 
			
				
					
						
							
							
								Fred Sundvik 
							
						 
					 
					
						
						
						
						
							
						
						
							881bde8258 
							
						 
					 
					
						
						
							
							Fix running make in parallel  
						
						
						
						
					 
					
						2016-08-20 03:56:34 +03:00 
						 
				 
			
				
					
						
							
							
								Fred Sundvik 
							
						 
					 
					
						
						
						
						
							
						
						
							dd8c1a7659 
							
						 
					 
					
						
						
							
							Don't add VERSION as a define  
						
						... 
						
						
						
						To avoid full recompilation when the git commit hash changes. 
						
						
					 
					
						2016-08-20 03:56:33 +03:00 
						 
				 
			
				
					
						
							
							
								Fred Sundvik 
							
						 
					 
					
						
						
						
						
							
						
						
							60c6e79ecb 
							
						 
					 
					
						
						
							
							Move git submodule check and version generation to main Makefile  
						
						
						
						
					 
					
						2016-08-20 03:56:32 +03:00 
						 
				 
			
				
					
						
							
							
								Fred Sundvik 
							
						 
					 
					
						
						
						
						
							
						
						
							cc2df445ab 
							
						 
					 
					
						
						
							
							Remove unneded code from tmk_core/rules.mk  
						
						
						
						
					 
					
						2016-08-20 03:56:31 +03:00 
						 
				 
			
				
					
						
							
							
								Fred Sundvik 
							
						 
					 
					
						
						
						
						
							
						
						
							67b294ca66 
							
						 
					 
					
						
						
							
							Actual compilation  
						
						
						
						
					 
					
						2016-08-20 03:56:30 +03:00 
						 
				 
			
				
					
						
							
							
								Fred Sundvik 
							
						 
					 
					
						
						
						
						
							
						
						
							db5c3b74fb 
							
						 
					 
					
						
						
							
							Add color output  
						
						
						
						
					 
					
						2016-08-20 03:56:29 +03:00 
						 
				 
			
				
					
						
							
							
								Fred Sundvik 
							
						 
					 
					
						
						
						
						
							
						
						
							0dd629a990 
							
						 
					 
					
						
						
							
							Fix running make from various subfolders  
						
						
						
						
					 
					
						2016-08-20 03:56:28 +03:00 
						 
				 
			
				
					
						
							
							
								Fred Sundvik 
							
						 
					 
					
						
						
						
						
							
						
						
							a04bb3a3ba 
							
						 
					 
					
						
						
							
							Fixed the shortcut targets  
						
						
						
						
					 
					
						2016-08-20 03:56:27 +03:00 
						 
				 
			
				
					
						
							
							
								Fred Sundvik 
							
						 
					 
					
						
						
						
						
							
						
						
							3fa6625869 
							
						 
					 
					
						
						
							
							Proper default goals when inside keyboard fodlers  
						
						
						
						
					 
					
						2016-08-20 03:56:26 +03:00 
						 
				 
			
				
					
						
							
							
								Fred Sundvik 
							
						 
					 
					
						
						
						
						
							
						
						
							459ddaceda 
							
						 
					 
					
						
						
							
							Add backwards compability with makefile variables  
						
						
						
						
					 
					
						2016-08-20 03:56:25 +03:00 
						 
				 
			
				
					
						
							
							
								Fred Sundvik 
							
						 
					 
					
						
						
						
						
							
						
						
							4f20061f66 
							
						 
					 
					
						
						
							
							Proper handling for running make from a subproject or keymap dir  
						
						
						
						
					 
					
						2016-08-20 03:56:24 +03:00 
						 
				 
			
				
					
						
							
							
								Fred Sundvik 
							
						 
					 
					
						
						
						
						
							
						
						
							051017c312 
							
						 
					 
					
						
						
							
							Split subproject make files into Makefile and rules.mk  
						
						
						
						
					 
					
						2016-08-20 03:56:23 +03:00 
						 
				 
			
				
					
						
							
							
								Fred Sundvik 
							
						 
					 
					
						
						
						
						
							
						
						
							c83af54513 
							
						 
					 
					
						
						
							
							Support for running from keyboard directory  
						
						
						
						
					 
					
						2016-08-20 03:56:21 +03:00 
						 
				 
			
				
					
						
							
							
								Fred Sundvik 
							
						 
					 
					
						
						
						
						
							
						
						
							1ad5578d11 
							
						 
					 
					
						
						
							
							Print error when building non-existing keyboard  
						
						
						
						
					 
					
						2016-08-20 03:56:20 +03:00 
						 
				 
			
				
					
						
							
							
								Fred Sundvik 
							
						 
					 
					
						
						
						
						
							
						
						
							a6d3500024 
							
						 
					 
					
						
						
							
							Print error message when trying to build non-existing keymap  
						
						
						
						
					 
					
						2016-08-20 03:56:20 +03:00 
						 
				 
			
				
					
						
							
							
								Fred Sundvik 
							
						 
					 
					
						
						
						
						
							
						
						
							2dd9c1edcd 
							
						 
					 
					
						
						
							
							Proper parsing of keymaps inside subprojects  
						
						
						
						
					 
					
						2016-08-20 03:56:19 +03:00 
						 
				 
			
				
					
						
							
							
								Fred Sundvik 
							
						 
					 
					
						
						
						
						
							
						
						
							44441de8ca 
							
						 
					 
					
						
						
							
							Split keyboard makefiles into rules and Makefile  
						
						
						
						
					 
					
						2016-08-20 03:56:08 +03:00 
						 
				 
			
				
					
						
							
							
								Fred Sundvik 
							
						 
					 
					
						
						
						
						
							
						
						
							0d5caead5a 
							
						 
					 
					
						
						
							
							Add default subproject parsing  
						
						
						
						
					 
					
						2016-08-20 03:24:40 +03:00 
						 
				 
			
				
					
						
							
							
								Fred Sundvik 
							
						 
					 
					
						
						
						
						
							
						
						
							091fab5103 
							
						 
					 
					
						
						
							
							Slight rearrange of the Makefile for easier readability  
						
						
						
						
					 
					
						2016-08-20 03:24:40 +03:00 
						 
				 
			
				
					
						
							
							
								Fred Sundvik 
							
						 
					 
					
						
						
						
						
							
						
						
							286b3b8057 
							
						 
					 
					
						
						
							
							Slight refactoring to remove some verbosity  
						
						
						
						
					 
					
						2016-08-20 03:24:40 +03:00 
						 
				 
			
				
					
						
							
							
								Fred Sundvik 
							
						 
					 
					
						
						
						
						
							
						
						
							1df6498721 
							
						 
					 
					
						
						
							
							Subproject parsing  
						
						... 
						
						
						
						Does not handle keyboards without subprojects correctly yet. 
						
						
					 
					
						2016-08-20 03:24:40 +03:00 
						 
				 
			
				
					
						
							
							
								Fred Sundvik 
							
						 
					 
					
						
						
						
						
							
						
						
							9ee6d4a23d 
							
						 
					 
					
						
						
							
							Proper looping for allkb and allkm  
						
						
						
						
					 
					
						2016-08-20 03:24:40 +03:00 
						 
				 
			
				
					
						
							
							
								Fred Sundvik 
							
						 
					 
					
						
						
						
						
							
						
						
							dfe510d5b8 
							
						 
					 
					
						
						
							
							Refactor common rule list parsing into own function  
						
						
						
						
					 
					
						2016-08-20 03:24:40 +03:00 
						 
				 
			
				
					
						
							
							
								Fred Sundvik 
							
						 
					 
					
						
						
						
						
							
						
						
							9b02e66ce0 
							
						 
					 
					
						
						
							
							Add keymap parsing  
						
						
						
						
					 
					
						2016-08-20 03:24:40 +03:00 
						 
				 
			
				
					
						
							
							
								Fred Sundvik 
							
						 
					 
					
						
						
						
						
							
						
						
							f97ae2b199 
							
						 
					 
					
						
						
							
							Rule parsing to match kebyoards  
						
						
						
						
					 
					
						2016-08-20 03:24:40 +03:00 
						 
				 
			
				
					
						
							
							
								Fred Sundvik 
							
						 
					 
					
						
						
						
						
							
						
						
							e6e675335d 
							
						 
					 
					
						
						
							
							First version of rule parsing  
						
						... 
						
						
						
						Only handles allkb at the moment. 
						
						
					 
					
						2016-08-20 03:24:40 +03:00 
						 
				 
			
				
					
						
							
							
								Fred Sundvik 
							
						 
					 
					
						
						
						
						
							
						
						
							86706de036 
							
						 
					 
					
						
						
							
							Parsing of makefile variables from starting dir  
						
						
						
						
					 
					
						2016-08-20 03:24:40 +03:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
						
						
							
						
						
							a3a312f8f4 
							
						 
					 
					
						
						
							
							Merge pull request  #662  from toneman77/iso_satan  
						
						... 
						
						
						
						Satan Cleanup 
						
						
					 
					
						2016-08-19 17:55:54 -04:00 
						 
				 
			
				
					
						
							
							
								Jack Humbert 
							
						 
					 
					
						
						
						
						
							
						
						
							47b670bced 
							
						 
					 
					
						
						
							
							Merge pull request  #663  from tomb0y/kc60_workman_dead  
						
						... 
						
						
						
						Add the workman-dead layout for kc60 
						
						
					 
					
						2016-08-19 17:54:12 -04:00 
						 
				 
			
				
					
						
							
							
								Sean Reifschneider 
							
						 
					 
					
						
						
						
						
							
						
						
							30c63b1495 
							
						 
					 
					
						
						
							
							Noting the change directory.  
						
						
						
						
					 
					
						2016-08-19 14:52:05 -06:00 
						 
				 
			
				
					
						
							
							
								Sean Reifschneider 
							
						 
					 
					
						
						
						
						
							
						
						
							b918aa6bab 
							
						 
					 
					
						
						
							
							Adding submodule note.  
						
						
						
						
					 
					
						2016-08-19 14:49:29 -06:00 
						 
				 
			
				
					
						
							
							
								Sean Reifschneider 
							
						 
					 
					
						
						
						
						
							
						
						
							50531068b3 
							
						 
					 
					
						
						
							
							Adding jafo layout.  
						
						
						
						
					 
					
						2016-08-19 14:42:41 -06:00 
						 
				 
			
				
					
						
							
							
								Sean Reifschneider 
							
						 
					 
					
						
						
						
						
							
						
						
							32216066e7 
							
						 
					 
					
						
						
							
							Adding nicer Infinity build instructions.  
						
						
						
						
					 
					
						2016-08-19 14:36:41 -06:00