Use the new cpc wrapper in Makefile