Merge "Add building with dep and exit when make fails"