Likewise modified the main Makefile to compile on both Linux and Mac (and hopefuly others).