Merge "Fix makefile warnings (typo)."