update Makefile to reflect moving functions from util.h to util.cpp