Merge "Clean cruft out of makefiles."