Merge core/Makefile in to cm10