More Makefile tweaks.