Unified makefile support to be more non check specific