Various Makefile.am fixes needed while trying 'make distcheck'

While trying 'make distcheck' ran into various errors. This fixes some, but there are yet more to do....