Makefile Cleanup - Remove external references - Make internally consistent - Fix manual unit test builds.
Makefile Cleanup - Remove external references - Make internally consistent - Fix manual unit test builds.

harfly/indigo,harfly/indigo,harfly/indigo,harfly/indigo