updated makefiles for ubuntu/osx