More WIP C++ support in Makefile