Issue #2358413 by Deciphered: Cleanup makefile.