Updated Makefiles for src/cpp & src/cpp/test