tidying up Makefiles in preparation for the merge with the main snap repo