Updates to Makefile for cpp