Add support for `--make`