Modified makefile.am per Peter's request