Separate Makefile generation from bootstrap