ToolChain: Makefile update