Update Makefile.am to build new compiler.  Not bootstrapping yet, of course, since the C++ output plugin is not written.
Fix problem with vpath builds.