Upgrading Makefile