Further makefile improvements.