Fix makefile generation after refactor