Makefile.am fixes per @javajolt's review