Merge "Clean cruft out of the elftree makefile."