Update for Makefile, after forking from shanesuper