Upgraded makefile (new global variables)