Merge pull request #1085 from JoesCat/master

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