Improve makfile