Some fundamental changes are required in the makefile, both cpuid and fifi should be compiled separately. To be honest, I am not sure if we should keep it. It quickly becomes a nuisance to maintain.