Making makefile format more sane