Enhance Makefile