Objective-C++ bits in Makefile
Old changes