Add makefile modes to non-whitespace modes