More makefile changes.