Changed Makefiles to reflect C++ source files