Restore 'coverage' Makefile target.

Ancillary changes to configure.ac/Makefile.am to ensure that both
CFLAGS and AM_CFLAGS are honored for all object files and don't
step on each other.
Merge remote-tracking branch 'zackw/master'

Conflicts:
	Makefile.am