Makefile revised