Re-arrange makefile to be slightly easier to read.