improved makefiles
merge catull pullrequest with fixes conformed to recent changes of the maintainer