Makefile upgraded