Even more makefile tweaks.