Added static library & updated makefiles