Makefile upgrading