Conditionalize yet more of the makefiles.