propagating Pat's fix for switch statement in all Makefiles