Small makefile enhancements