Update Makefile to latest changes.