[chuck-dev] Improve makefile