Further simplifications to OSX makefile