Adding feature-file-concat software and Makefile correction