Merge Makefile changes.