More Makefile.am adjustments.