Plus some makefile cleanup. part of a patch from Richard Evans
Attach a file by drag & drop or click to upload
