makefile.am tweaks