More Makefile.am configuration changes