Updated Makefiles to work correctly on MIC unmodified.