Cleanup of Makefiles for Mac OS X