Further makefile cleanup.