Pass make options through to sub-make
Better vector, better tests