Makefile improved