Makefile adapted for CM10.1 branch