updating Makefiles to work with latest version