* Makefile.am: Merge src/Makefile.am. * configure.ac: Reflect changes above. * src/Makefile.am: Remove.