Standardize makefiles, adjust to cppunit changes (minor).