Merge "Refactor makefile."