Clean up makefiles, reduce build time on no-change build