further Makefile enhancements