Upating Makefiles for commotion-specific customizations