Fixed makefile issues.
Confirmed build works in linux.