renamed makefile to makefile-osx for inclusion into master