and fix Makefile.am ...