Update Makefile and buildfile.