Hello,

The attached hopefully addresses the problems Daniel encountered when 
trying to build all targets.

I'll table it for a few days then, baring comments, commit.

enjoy,
Andrew