More Makefile.am cleanup so that remote builds work now.