Enhanced Makefile