Updating Makefile to use xctool