Fix typo in Makefile and force use of cl.hpp to compile on manipa