r24955: Reformat some object lists in Makefile.in to minimize the diff.