Fix makefile to reflect current state of code.