put the two make files back into one