Comment 2 for bug 1272472

Folks, I deleted my old branch of this that was a mess.

I pushed a newly created branch, and it's linked above.

I have not proposed for merging yet because I am taking it step by step. The new branch contains changes to the Makefile only as of this writing. Feel free to add on from here or I will as I get around to it.