Improve makefile a bit