Build trivial

Here is a first set of Makefile patches, now submitted through github...