Adjustments and clean-ups for Makefile for C++ benchmark and drivers