Cleanup makefile.am for --with-devel-headers