Makefile enhancements