Toward C++, broken
Repair Makefile