Update those makefiles which I understand how to update.

Build needs updating however I can test only these,
so have changed only these.