Added c++ support to the makefile