am e18ed89e: Merge "Remove makefile cruft."

* commit 'e18ed89eae41f9be0f4ddfc77a3c4d68c901925f':
  Remove makefile cruft.