Update Makefile for C++ code