Fix up makefile after merge.