Split the dvi and non-dvi targets