move optional features to stub make files