Makefiles for new option types added.