Makefile changes for wheatley support