added -r makefiles flag everywhere