Further refactoring of Makefile

Quietens warnings caused by cl.hpp as well