Tidy up Makefiles.
Re-work Makefiles.