Merge pull request #367 from bastih/master

Clean up makefiles, reduce build time on no-change build
Merge pull request #370 from bastih/master

More cleanups