Makefile enhancements.