Updated to run appropriate sub-make