Simplifies Makefile removing particular paths.
Merge branch 'master' into xtrmm