Found a way to re-generate the Makefiles as required