More Makefile.am cleanup.