Remove last vestiges of C++ from makefile