Makefile.am: put in a more logical order.