Add multi-make support