More makefile tweaks.