Makefile enhanced