Split up some make commands, so that errors aren't overlooked