need to integrated that new Makefile.am too