adjust Makefile for new versions of ICC and MKL