Merge "Simplify makefile."