Completed the Makefile changes Justin requested.