Organizes all Makefile.am

Now using one file per line (sorted). This is the better way
to handle it, since it reduces the possibility of merge conflicts.