Remove makefile, make changes to makefile.am