Merge "Fix makefile warning."