Checking in some Makefile changes.