Comment 6 for bug 1071928

So I ended up going with something slightly different but giving the same result: http://paste.ubuntu.com/1542053/

I think it's a bit easier to understand, makes the stamps work as expected and as far as I can tell, the distclean call cleans up everything properly and the binaries end up being different as is expected.